From cfa180de5fbed8a7c754e837747bff2fa7fe2d71 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Tue, 18 Jul 2017 12:45:46 -0700 Subject: [PATCH] Use shared library output from shared toolchain (#3869) This is needed for https://fuchsia-review.googlesource.com/c/37541 --- build/flutter_app.gni | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/flutter_app.gni b/build/flutter_app.gni index a4576035a..59de62a10 100644 --- a/build/flutter_app.gni +++ b/build/flutter_app.gni @@ -4,6 +4,7 @@ assert(is_fuchsia) +import("//build/toolchain/shared.gni") import("//build/dart/dart_package.gni") import("//flutter/lib/ui/dart_ui.gni") import("//apps/mozart/lib/flutter/sdk_ext/sdk_ext.gni") @@ -307,7 +308,7 @@ template("flutter_aot_app") { dylib_label = target_name + "_dylib" outer_target_name = target_name - shared_library(dylib_label) { + fuchsia_shared_library(dylib_label) { deps = [ ":$assembly_label", ] @@ -321,7 +322,9 @@ template("flutter_aot_app") { output_name = outer_target_name } - dylib_path = "$root_out_dir/lib.unstripped/lib$target_name.so" + dylib_path = + get_label_info(":$dylib_label(${target_toolchain}-shared)", + "root_out_dir") + "/lib.unstripped/lib$target_name.so" action(target_name) { depfile = bundle_depfile