diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni index a30d392c526e9..5606565987a90 100644 --- a/tools/fuchsia/fuchsia_archive.gni +++ b/tools/fuchsia/fuchsia_archive.gni @@ -105,8 +105,14 @@ template("_fuchsia_archive") { } foreach(lib, pkg.libraries) { + output_path = "" + + if (defined(lib.output_path)) { + output_path = lib.output_path + } + copy_sources += [ "${lib.path}/${lib.name}" ] - copy_outputs += [ "$far_base_dir/lib/${lib.name}" ] + copy_outputs += [ "$far_base_dir/lib/${output_path}${lib.name}" ] } pkg_dir_deps = pkg.deps diff --git a/tools/fuchsia/fuchsia_libs.gni b/tools/fuchsia/fuchsia_libs.gni index 08f34a71e622f..2458e4e617d29 100644 --- a/tools/fuchsia/fuchsia_libs.gni +++ b/tools/fuchsia/fuchsia_libs.gni @@ -59,6 +59,7 @@ common_libs = [ { name = "ld.so.1" path = rebase_path("$sysroot_dist_lib/$ld_so_path") + output_path = ld_so_path }, ]