DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Namespace patched SDK names to not conflict with Topaz (flutter/engine#12218)

Browse Source
This commit is contained in:
Kaushik Iska 2019-09-11 08:19:58 -07:00 committed by GitHub
parent b91c47ae34
commit f4ecd9c175
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/lib/snapshot/BUILD.gn
View File

@ -24,7 +24,7 @@ compiled_action("generate_snapshot_bin") {
if (is_fuchsia || is_fuchsia_host) {
platform_kernel =
"$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"
"$root_out_dir/engine_flutter_runner_patched_sdk/platform_strong.dill"
} else {
platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
}
@ -209,7 +209,7 @@ bin_to_linkable("platform_strong_dill_linkable") {
":kernel_platform_files",
]
if (is_fuchsia || is_fuchsia_host) {
input = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"
input = "$root_out_dir/engine_flutter_runner_patched_sdk/platform_strong.dill"
} else {
input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
}

4
engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
View File

@ -9,7 +9,7 @@ import("//topaz/runtime/dart/dart_kernel.gni")
dart_kernel("shim") {
platform_name = "dart_runner"
platform_deps = [ "//topaz/runtime/dart_runner/kernel:kernel_platform_files" ]
platform_path = "$root_out_dir/dart_runner_patched_sdk"
platform_path = "$root_out_dir/engine_dart_runner_patched_sdk"
disable_analysis = true
@ -24,7 +24,7 @@ dart_kernel("shim") {
dart_kernel("shim_product") {
platform_name = "dart_runner"
platform_deps = [ "//topaz/runtime/dart_runner/kernel:kernel_platform_files" ]
platform_path = "$root_out_dir/dart_runner_patched_sdk"
platform_path = "$root_out_dir/engine_dart_runner_patched_sdk"
disable_analysis = true

7
engine/src/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
View File

@ -15,8 +15,8 @@ compile_platform("kernel_platform_files") {
libraries_specification_uri = "org-dartlang-sdk:///flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json"
outputs = [
"$root_out_dir/dart_runner_patched_sdk/platform_strong.dill",
"$root_out_dir/dart_runner_patched_sdk/vm_outline_strong.dill",
"$root_out_dir/engine_dart_runner_patched_sdk/platform_strong.dill",
"$root_out_dir/engine_dart_runner_patched_sdk/vm_outline_strong.dill",
]
args = [
@ -40,7 +40,8 @@ template("create_kernel_core_snapshot") {
":kernel_platform_files",
]
platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill"
platform_dill =
"$root_out_dir/engine_dart_runner_patched_sdk/platform_strong.dill"
compilation_trace =
"$flutter_root/shell/platform/fuchsia/flutter/compilation_trace.txt"
inputs = [

6
engine/src/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn
View File

@ -15,8 +15,8 @@ compile_platform("kernel_platform_files") {
libraries_specification_uri = "org-dartlang-sdk:///flutter/shell/platform/fuchsia/flutter/kernel/libraries.json"
outputs = [
"$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill",
"$root_out_dir/flutter_runner_patched_sdk/vm_outline_strong.dill",
"$root_out_dir/engine_flutter_runner_patched_sdk/platform_strong.dill",
"$root_out_dir/engine_flutter_runner_patched_sdk/vm_outline_strong.dill",
]
args = [
@ -44,7 +44,7 @@ template("core_snapshot") {
]
platform_dill =
"$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"
"$root_out_dir/engine_flutter_runner_patched_sdk/platform_strong.dill"
compilation_trace =
"$flutter_root/shell/platform/fuchsia/flutter/compilation_trace.txt"
inputs = [

9
engine/src/flutter/tools/fuchsia/build_fuchsia_artifacts.py
View File

@ -125,11 +125,12 @@ def CopyToBucketWithMode(source, destination, aot, product, runner_type):
destination = os.path.join(_bucket_directory, destination, mode)
CreateFarPackage(pm_bin, far_base, key_path, destination)
patched_sdk_dirname = '%s_runner_patched_sdk' % runner_type
patched_sdk_dir = os.path.join(source_root, patched_sdk_dirname)
dest_sdk_path = os.path.join(destination, patched_sdk_dirname)
src_patched_sdk_dirname = 'engine_%s_runner_patched_sdk' % runner_type
src_patched_sdk_dir = os.path.join(source_root, src_patched_sdk_dirname)
dest_patched_sdk_dirname = '%s_runner_patched_sdk' % runner_type
dest_sdk_path = os.path.join(destination, dest_patched_sdk_dirname)
if not os.path.exists(dest_sdk_path):
CopyPath(patched_sdk_dir, dest_sdk_path)
CopyPath(src_patched_sdk_dir, dest_sdk_path)
CopyGenSnapshotIfExists(source_root, destination)