From 001a267498bf0635511653a23e0ed2b14ef53cf0 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 9 Oct 2018 08:00:00 -0700 Subject: [PATCH] Revert "Revert "Use single_root_scheme when compiling platform (#6402)" (#6431)" (flutter/engine#6473) This reverts commit 4ef754772e066912f814440b00044dc501ad7f2a, relands single root filesystem that is needed for reusable platform kernel files, that is safe to land now since dart roll a2ebb14376a9a7acb38e3802b16f705233f8fc9a has the fix for previously broken dependency file generation. --- engine/src/flutter/lib/snapshot/BUILD.gn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/lib/snapshot/BUILD.gn b/engine/src/flutter/lib/snapshot/BUILD.gn index 4eaa3bd248..43c14a8376 100644 --- a/engine/src/flutter/lib/snapshot/BUILD.gn +++ b/engine/src/flutter/lib/snapshot/BUILD.gn @@ -169,7 +169,9 @@ source_set("snapshot") { } compile_platform("non_strong_platform") { - libraries_specification_uri = "libraries.json" + single_root_scheme = "org-dartlang-sdk" + single_root_base = rebase_path("../../../") + libraries_specification_uri = "org-dartlang-sdk:///flutter/lib/snapshot/libraries.json" outputs = [ "$root_out_dir/flutter_patched_sdk/platform.dill", @@ -183,7 +185,9 @@ compile_platform("non_strong_platform") { } compile_platform("strong_platform") { - libraries_specification_uri = "libraries.json" + single_root_scheme = "org-dartlang-sdk" + single_root_base = rebase_path("../../../") + libraries_specification_uri = "org-dartlang-sdk:///flutter/lib/snapshot/libraries.json" outputs = [ "$root_out_dir/flutter_patched_sdk/platform_strong.dill",