firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual roll of Dart from 24c7666def...40fd1c456e (flutter/engine#20092)

Browse Source 
* Manual roll of Dart from 24c7666def...40fd1c456e

dart-lang/sdk@40fd1c456e Revert "[dart:io] Add Abort() on HttpClientRequest"
dart-lang/sdk@17d7296a42 [vm/nnbd/bytecode] Fix reuse of type arguments in bytecode
dart-lang/sdk@58b6f40c73 Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns. (reland)
dart-lang/sdk@fc8a6d9f9b [VM/compiler] Dereference TypeRef literal when propagating constants.
dart-lang/sdk@0689ec527a Move "test.dart" (well, most of its contents) into pkg/test_runner.
dart-lang/sdk@1094b3c61d Prepare static error test updater tool to handle web tests.
dart-lang/sdk@b258585f2f [observatory] Migrate from deprecated isInstanceOf to isA.
dart-lang/sdk@dfe1d9b682 Disable OverrideContributor for Cider.
dart-lang/sdk@aea99b2f5c scope debug property assist to Diagnosticables
dart-lang/sdk@4b96f20a79 [dart:io] Add Abort() on HttpClientRequest
dart-lang/sdk@1b1a39708c [build] Use frameworks instead of libs
dart-lang/sdk@3fef522496 Revert "Reland "[vm] Replaces fuchsia.deprecatedtimezone""
dart-lang/sdk@8c664d4f3f Revert "Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns."
dart-lang/sdk@2efb5bebc7 [ dart:_http ] Fix typo in HTTP response timeline event
dart-lang/sdk@0884dae36c Revert "Fix the #include path for ICU headers"
dart-lang/sdk@5171534e81 Scope tweaks. Report REFERENCED_BEFORE_DECLARATION in more places.
dart-lang/sdk@6bba75079a Issue 42797. Understand in legacy libraries that a function returning Never (in Null Safety library) never returns.
dart-lang/sdk@b4ebbb7f5c [build] Update gn to match Fuchsia
dart-lang/sdk@cb428a7a02 [dart2js] Remove old bug work around in collector.
dart-lang/sdk@08663c20ab Change flutter patch to match existing DEPS on master branch
dart-lang/sdk@146ad014d9 update js/meta for the 2.10 dev sdk
dart-lang/sdk@488c718793 [co19] Roll co19 to d79951e06e443213243e54c2c32694b79a221b65
dart-lang/sdk@ba20edd7be Add patch for flutter-engine when changing to version 2.10

* Rev buildroot to latest version.

* Update license.

* update.

* Update gn revision.

* Format BUILD.gn files as the gn revision has been updated.
This commit is contained in:
Siva
2020-07-29 13:10:15 -07:00
committed by GitHub
parent 6bfe5b80f6
commit 03706dce89
68 changed files with 268 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@@ -34,7 +34,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '24c7666def53832a31559beac130eb3336008110',
'dart_revision': '40fd1c456e0a872ab8f6d2a018b3436d2f7a5f84',
# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -107,7 +107,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '6728d80355083a20ceecb6db1d73c16dee255a43',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '4073a7a300d845597b8b2d553e584d3fd97f70df',
# Fuchsia compatibility
#
@@ -485,7 +485,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/${{platform}}',
'version': 'git_revision:152c5144ceed9592c20f0c8fd55769646077569b'
'version': 'git_revision:1e3fd10c5df6b704fc764ee388149e4f32862823'
},
],
'dep_type': 'cipd',

12
engine/src/flutter/BUILD.gn
View File

@@ -37,9 +37,7 @@ config("fuchsia_legacy") {
config("export_dynamic_symbols") {
if (is_linux || is_fuchsia) {
inputs = [
"//flutter/common/exported_symbols.sym",
]
inputs = [ "//flutter/common/exported_symbols.sym" ]
ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
}
}
@@ -165,17 +163,13 @@ group("flutter") {
group("dist") {
testonly = true
deps = [
"//flutter/sky/dist",
]
deps = [ "//flutter/sky/dist" ]
}
if (is_fuchsia) {
group("fuchsia_tests") {
testonly = true
deps = [
"//flutter/shell/platform/fuchsia:tests",
]
deps = [ "//flutter/shell/platform/fuchsia:tests" ]
}
}

12
engine/src/flutter/build/dart/rules.gni
View File

@@ -163,12 +163,8 @@ template("dart_pkg") {
dartx_application("${app_name}_dart_app") {
output_name = dartx_output_name
main_dart = rebase_path(app_entrypoint, "", pkg_helper_output_dir)
sources = [
"$root_gen_dir/dart-pkg/${dart_package_name}.stamp",
]
deps = [
":$dart_pkg_target_name",
]
sources = [ "$root_gen_dir/dart-pkg/${dart_package_name}.stamp" ]
deps = [ ":$dart_pkg_target_name" ]
deps += invoker.deps
if (defined(invoker.strict)) {
strict = invoker.strict
@@ -178,9 +174,7 @@ template("dart_pkg") {
}
group(target_name) {
public_deps = [
":$dart_pkg_target_name",
]
public_deps = [ ":$dart_pkg_target_name" ]
if (defined(invoker.apps)) {
foreach(app, invoker.apps) {
app_name = app[0]

4
engine/src/flutter/build/zip_bundle.gni
View File

@@ -37,9 +37,7 @@ template("zip_bundle") {
assert(defined(invoker.files), "files must be defined as a list of scopes")
action(target_name) {
script = "//flutter/build/zip.py"
outputs = [
"$root_build_dir/zip_archives/${invoker.output}",
]
outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ]
inputs = []
deps = invoker.deps

4
engine/src/flutter/common/BUILD.gn
View File

@@ -16,9 +16,7 @@ source_set("common") {
"task_runners.h",
]
deps = [
"//flutter/fml",
]
deps = [ "//flutter/fml" ]
public_configs = [
":flutter_config",

12
engine/src/flutter/flow/BUILD.gn
View File

@@ -183,24 +183,18 @@ if (enable_unittests) {
executable("flow_unittests") {
testonly = true
deps = [
":flow_unittests_common_fuchsia_legacy",
]
deps = [ ":flow_unittests_common_fuchsia_legacy" ]
}
executable("flow_unittests_next") {
testonly = true
deps = [
":flow_unittests_common",
]
deps = [ ":flow_unittests_common" ]
}
} else {
executable("flow_unittests") {
testonly = true
deps = [
":flow_unittests_common",
]
deps = [ ":flow_unittests_common" ]
}
}
}

4
engine/src/flutter/flutter_frontend_server/BUILD.gn
View File

@@ -22,9 +22,7 @@ frontend_server_files +=
application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
deps = [
"//flutter/lib/snapshot:kernel_platform_files",
]
deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]
dot_packages = rebase_path(".dart_tool/package_config.json")
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
training_args = [

4
engine/src/flutter/fml/BUILD.gn
View File

@@ -230,9 +230,7 @@ if (enable_unittests) {
executable("fml_benchmarks") {
testonly = true
sources = [
"message_loop_task_queues_benchmark.cc",
]
sources = [ "message_loop_task_queues_benchmark.cc" ]
deps = [
"//flutter/benchmarking",

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

@@ -14,9 +14,7 @@ copy("generate_dart_ui") {
visibility = [ ":*" ]
sources = dart_ui_files
outputs = [
"$bindings_output_dir/dart_ui/{{source_file_part}}",
]
outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ]
}
compiled_action("generate_snapshot_bin") {
@@ -32,12 +30,8 @@ compiled_action("generate_snapshot_bin") {
platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
inputs = [
platform_kernel,
]
deps = [
":kernel_platform_files",
]
inputs = [ platform_kernel ]
deps = [ ":kernel_platform_files" ]
vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin"
vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin"
@@ -109,9 +103,7 @@ template("bin_to_assembly") {
script,
invoker.input,
]
outputs = [
output,
]
outputs = [ output ]
}
}
@@ -150,12 +142,8 @@ template("bin_to_coff") {
if (current_cpu == "x64") {
args += [ "--64-bit" ]
}
inputs = [
invoker.input,
]
outputs = [
output,
]
inputs = [ invoker.input ]
outputs = [ output ]
}
}
@@ -174,45 +162,35 @@ template("bin_to_linkable") {
}
bin_to_linkable("vm_snapshot_data_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/vm_isolate_snapshot.bin"
symbol = "kDartVmSnapshotData"
executable = false
}
bin_to_linkable("vm_snapshot_instructions_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/vm_snapshot_instructions.bin"
symbol = "kDartVmSnapshotInstructions"
executable = true
}
bin_to_linkable("isolate_snapshot_data_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/isolate_snapshot.bin"
symbol = "kDartIsolateSnapshotData"
executable = false
}
bin_to_linkable("isolate_snapshot_instructions_linkable") {
deps = [
":generate_snapshot_bin",
]
deps = [ ":generate_snapshot_bin" ]
input = "$target_gen_dir/isolate_snapshot_instructions.bin"
symbol = "kDartIsolateSnapshotInstructions"
executable = true
}
bin_to_linkable("platform_strong_dill_linkable") {
deps = [
":kernel_platform_files",
]
deps = [ ":kernel_platform_files" ]
input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
symbol = "kPlatformStrongDill"
size_symbol = "kPlatformStrongDillSize"
@@ -261,7 +239,5 @@ compile_platform("strong_platform") {
# Fuchsia's snapshot requires a different platform with extra dart: libraries.
group("kernel_platform_files") {
public_deps = [
":strong_platform",
]
public_deps = [ ":strong_platform" ]
}

20
engine/src/flutter/lib/ui/BUILD.gn
View File

@@ -113,9 +113,7 @@ source_set_maybe_fuchsia_legacy("ui") {
public_configs = [ "//flutter:config" ]
public_deps = [
"//flutter/third_party/txt",
]
public_deps = [ "//flutter/third_party/txt" ]
deps = [
"//flutter/assets",
@@ -163,9 +161,7 @@ if (enable_unittests) {
public_configs = [ "//flutter:export_dynamic_symbols" ]
sources = [
"ui_benchmarks.cc",
]
sources = [ "ui_benchmarks.cc" ]
deps = [
":ui",
@@ -213,24 +209,18 @@ if (enable_unittests) {
executable("ui_unittests") {
testonly = true
deps = [
":ui_unittests_common_fuchsia_legacy",
]
deps = [ ":ui_unittests_common_fuchsia_legacy" ]
}
executable("ui_unittests_next") {
testonly = true
deps = [
":ui_unittests_common",
]
deps = [ ":ui_unittests_common" ]
}
} else {
executable("ui_unittests") {
testonly = true
deps = [
":ui_unittests_common",
]
deps = [ ":ui_unittests_common" ]
}
}
}

20
engine/src/flutter/runtime/BUILD.gn
View File

@@ -10,9 +10,7 @@ source_set("test_font") {
"test_font_data.cc",
"test_font_data.h",
]
deps = [
"//third_party/skia",
]
deps = [ "//third_party/skia" ]
public_configs = [ "//flutter:config" ]
defines = []
if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
@@ -69,9 +67,7 @@ source_set_maybe_fuchsia_legacy("runtime") {
"window_data.h",
]
public_deps = [
"//third_party/rapidjson",
]
public_deps = [ "//third_party/rapidjson" ]
public_configs = [ "//flutter:config" ]
@@ -142,25 +138,19 @@ if (enable_unittests) {
executable("runtime_unittests") {
testonly = true
deps = [
":runtime_unittests_common_fuchsia_legacy",
]
deps = [ ":runtime_unittests_common_fuchsia_legacy" ]
}
executable("runtime_unittests_next") {
testonly = true
deps = [
":runtime_unittests_common",
]
deps = [ ":runtime_unittests_common" ]
}
} else {
executable("runtime_unittests") {
testonly = true
deps = [
":runtime_unittests_common",
]
deps = [ ":runtime_unittests_common" ]
}
}
}

4
engine/src/flutter/shell/BUILD.gn
View File

@@ -3,7 +3,5 @@
# found in the LICENSE file.
group("shell") {
deps = [
"platform",
]
deps = [ "platform" ]
}

8
engine/src/flutter/shell/common/BUILD.gn
View File

@@ -30,9 +30,7 @@ template("dart_embedder_resources") {
}
output = invoker.output
outputs = [
output,
]
outputs = [ output ]
inputs = [ script ] + invoker.inputs
@@ -174,9 +172,7 @@ if (enable_unittests) {
}
shell_host_executable("shell_benchmarks") {
sources = [
"shell_benchmarks.cc",
]
sources = [ "shell_benchmarks.cc" ]
deps = [
":shell_unittests_fixtures",

12
engine/src/flutter/shell/platform/BUILD.gn
View File

@@ -7,13 +7,9 @@ import("//flutter/shell/platform/config.gni")
group("platform") {
if (is_mac || is_ios) {
deps = [
"darwin",
]
deps = [ "darwin" ]
} else if (is_android) {
deps = [
"android",
]
deps = [ "android" ]
} else if (is_linux) {
deps = []
if (enable_desktop_embeddings) {
@@ -25,9 +21,7 @@ group("platform") {
deps += [ "windows" ]
}
} else if (is_fuchsia) {
deps = [
"fuchsia",
]
deps = [ "fuchsia" ]
} else {
assert(false, "Unknown/Unsupported platform.")
}

48
engine/src/flutter/shell/platform/android/BUILD.gn
View File

@@ -99,9 +99,7 @@ action("gen_android_build_config_java") {
build_config_java = "$target_gen_dir/io/flutter/BuildConfig.java"
outputs = [
build_config_java,
]
outputs = [ build_config_java ]
args = [
"--out",
@@ -151,14 +149,14 @@ android_java_sources = [
"io/flutter/embedding/engine/FlutterEnginePluginRegistry.java",
"io/flutter/embedding/engine/FlutterJNI.java",
"io/flutter/embedding/engine/FlutterOverlaySurface.java",
"io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java",
"io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java",
"io/flutter/embedding/engine/FlutterShellArgs.java",
"io/flutter/embedding/engine/dart/DartExecutor.java",
"io/flutter/embedding/engine/dart/DartMessenger.java",
"io/flutter/embedding/engine/dart/PlatformMessageHandler.java",
"io/flutter/embedding/engine/loader/FlutterLoader.java",
"io/flutter/embedding/engine/loader/ResourceExtractor.java",
"io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java",
"io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java",
"io/flutter/embedding/engine/plugins/FlutterPlugin.java",
"io/flutter/embedding/engine/plugins/PluginRegistry.java",
"io/flutter/embedding/engine/plugins/activity/ActivityAware.java",
@@ -295,9 +293,7 @@ action("flutter_shell_java") {
args += rebase_path(sources, root_build_dir)
deps = [
":gen_android_build_config_java",
]
deps = [ ":gen_android_build_config_java" ]
}
action("icudtl_object") {
@@ -306,13 +302,9 @@ action("icudtl_object") {
icudtl_input = "//third_party/icu/flutter/icudtl.dat"
icudtl_output = "$root_build_dir/flutter_icu/icudtl.o"
inputs = [
"$icudtl_input",
]
inputs = [ "$icudtl_input" ]
outputs = [
"$icudtl_output",
]
outputs = [ "$icudtl_output" ]
args = [
"--objcopy",
@@ -374,16 +366,12 @@ action("android_jar") {
action("pom_libflutter") {
script = "//flutter/tools/androidx/generate_pom_file.py"
inputs = [
"//flutter/tools/androidx/files.json",
]
inputs = [ "//flutter/tools/androidx/files.json" ]
artifact_id =
string_replace(android_app_abi, "-", "_") + "_" + flutter_runtime_mode
outputs = [
"$root_build_dir/$artifact_id.pom",
]
outputs = [ "$root_build_dir/$artifact_id.pom" ]
args = [
"--destination",
@@ -398,15 +386,11 @@ action("pom_libflutter") {
action("pom_embedding") {
script = "//flutter/tools/androidx/generate_pom_file.py"
inputs = [
"//flutter/tools/androidx/files.json",
]
inputs = [ "//flutter/tools/androidx/files.json" ]
artifact_id = "flutter_embedding_$flutter_runtime_mode"
outputs = [
"$root_build_dir/$artifact_id.pom",
]
outputs = [ "$root_build_dir/$artifact_id.pom" ]
args = [
"--destination",
@@ -513,9 +497,7 @@ zip_bundle("android_symbols") {
},
]
deps = [
":flutter_shell_native",
]
deps = [ ":flutter_shell_native" ]
}
zip_bundle("android") {
@@ -549,9 +531,7 @@ action("gen_android_javadoc") {
script = "//flutter/tools/gen_javadoc.py"
sources = android_java_sources + embedding_dependencies_jars
outputs = [
"$target_gen_dir/javadocs",
]
outputs = [ "$target_gen_dir/javadocs" ]
args = [
"--out-dir",
rebase_path(outputs[0]),
@@ -574,7 +554,5 @@ zip_bundle("android_javadoc") {
destination = "/"
},
]
deps = [
":gen_android_javadoc",
]
deps = [ ":gen_android_javadoc" ]
}

4
engine/src/flutter/shell/platform/android/context/BUILD.gn
View File

@@ -12,7 +12,5 @@ source_set("context") {
public_configs = [ "//flutter:config" ]
deps = [
"//flutter/fml",
]
deps = [ "//flutter/fml" ]
}

12
engine/src/flutter/shell/platform/android/jni/BUILD.gn
View File

@@ -25,15 +25,11 @@ source_set("jni") {
source_set("jni_mock") {
testonly = true
sources = [
"jni_mock.h",
]
sources = [ "jni_mock.h" ]
public_configs = [ "//flutter:config" ]
deps = [
":jni",
]
deps = [ ":jni" ]
}
test_fixtures("jni_fixtures") {
@@ -43,9 +39,7 @@ test_fixtures("jni_fixtures") {
executable("jni_unittests") {
testonly = true
sources = [
"jni_mock_unittest.cc",
]
sources = [ "jni_mock_unittest.cc" ]
deps = [
":jni_fixtures",

4
engine/src/flutter/shell/platform/android/platform_view_android_delegate/BUILD.gn
View File

@@ -30,9 +30,7 @@ test_fixtures("platform_view_android_delegate_fixtures") {
executable("platform_view_android_delegate_unittests") {
testonly = true
sources = [
"platform_view_android_delegate_unittests.cc",
]
sources = [ "platform_view_android_delegate_unittests.cc" ]
deps = [
":platform_view_android_delegate",

24
engine/src/flutter/shell/platform/common/cpp/BUILD.gn
View File

@@ -32,19 +32,13 @@ source_set("common_cpp_library_headers") {
copy("publish_headers") {
sources = _public_headers
outputs = [
"$root_out_dir/{{source_file_part}}",
]
outputs = [ "$root_out_dir/{{source_file_part}}" ]
}
source_set("common_cpp_input") {
public = [
"text_input_model.h",
]
public = [ "text_input_model.h" ]
sources = [
"text_input_model.cc",
]
sources = [ "text_input_model.cc" ]
configs += [ ":desktop_library_implementation" ]
@@ -88,13 +82,9 @@ source_set("common_cpp") {
# embedding is futher along and it's clearer how much, if any, shared
# API surface there will be.
source_set("common_cpp_core") {
public = [
"path_utils.h",
]
public = [ "path_utils.h" ]
sources = [
"path_utils.cc",
]
sources = [ "path_utils.cc" ]
}
if (enable_unittests) {
@@ -105,9 +95,7 @@ if (enable_unittests) {
executable("common_cpp_core_unittests") {
testonly = true
sources = [
"path_utils_unittests.cc",
]
sources = [ "path_utils_unittests.cc" ]
deps = [
":common_cpp_core",

9
engine/src/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn
View File

@@ -10,9 +10,7 @@ source_set("client_wrapper") {
sources = core_cpp_client_wrapper_sources
public = core_cpp_client_wrapper_includes
deps = [
"//flutter/shell/platform/common/cpp:common_cpp_library_headers",
]
deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
configs +=
[ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
@@ -29,9 +27,8 @@ source_set("client_wrapper_library_stubs") {
defines = [ "FLUTTER_DESKTOP_LIBRARY" ]
public_deps = [
"//flutter/shell/platform/common/cpp:common_cpp_library_headers",
]
public_deps =
[ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
}
test_fixtures("client_wrapper_fixtures") {

16
engine/src/flutter/shell/platform/common/cpp/client_wrapper/publish.gni
View File

@@ -44,25 +44,19 @@ template("publish_client_wrapper") {
]
sources = invoker.public
outputs = [
"$publish_dir_root/include/$namespace/{{source_file_part}}",
]
outputs = [ "$publish_dir_root/include/$namespace/{{source_file_part}}" ]
}
copy("${template_target_name}_publish_sources") {
visibility = [ ":$template_target_name" ]
sources = invoker.sources
outputs = [
"$publish_dir_root/{{source_file_part}}",
]
outputs = [ "$publish_dir_root/{{source_file_part}}" ]
# GN on Windows appears to do #include checks even for copy
# targets, so add the dependency to the headers to satisfy
# the check.
deps = [
":${template_target_name}_publish_includes",
]
deps = [ ":${template_target_name}_publish_includes" ]
}
}
@@ -103,8 +97,6 @@ template("publish_client_wrapper_extension") {
"sources",
"directory_suffix",
])
public_deps = [
":$core_target_name",
]
public_deps = [ ":$core_target_name" ]
}
}

4
engine/src/flutter/shell/platform/darwin/BUILD.gn
View File

@@ -9,9 +9,7 @@ import("//flutter/testing/testing.gni")
group("darwin") {
if (is_ios) {
deps = [
"ios:flutter_framework",
]
deps = [ "ios:flutter_framework" ]
}
if (is_mac) {
deps = []

64
engine/src/flutter/shell/platform/darwin/ios/BUILD.gn
View File

@@ -236,9 +236,7 @@ shared_library("create_flutter_framework_dylib") {
public = _flutter_framework_headers
deps = [
":flutter_framework_source",
]
deps = [ ":flutter_framework_source" ]
public_configs = [ "//flutter:config" ]
}
@@ -246,27 +244,17 @@ shared_library("create_flutter_framework_dylib") {
copy("copy_dylib") {
visibility = [ ":*" ]
sources = [
"$root_out_dir/libFlutter.dylib",
]
outputs = [
"$_flutter_framework_dir/Flutter",
]
sources = [ "$root_out_dir/libFlutter.dylib" ]
outputs = [ "$_flutter_framework_dir/Flutter" ]
deps = [
":create_flutter_framework_dylib",
]
deps = [ ":create_flutter_framework_dylib" ]
}
action("copy_framework_info_plist") {
script = "//flutter/build/copy_info_plist.py"
visibility = [ ":*" ]
sources = [
"framework/Info.plist",
]
outputs = [
"$_flutter_framework_dir/Info.plist",
]
sources = [ "framework/Info.plist" ]
outputs = [ "$_flutter_framework_dir/Info.plist" ]
args = [
rebase_path(sources[0]),
rebase_path(outputs[0]),
@@ -276,12 +264,8 @@ action("copy_framework_info_plist") {
copy("copy_framework_module_map") {
visibility = [ ":*" ]
sources = [
"framework/module.modulemap",
]
outputs = [
"$_flutter_framework_dir/Modules/module.modulemap",
]
sources = [ "framework/module.modulemap" ]
outputs = [ "$_flutter_framework_dir/Modules/module.modulemap" ]
}
action("copy_framework_headers") {
@@ -303,44 +287,28 @@ action("copy_framework_headers") {
copy("copy_framework_icu") {
visibility = [ ":*" ]
sources = [
"//third_party/icu/flutter/icudtl.dat",
]
outputs = [
"$_flutter_framework_dir/{{source_file_part}}",
]
sources = [ "//third_party/icu/flutter/icudtl.dat" ]
outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ]
}
copy("copy_framework_podspec") {
visibility = [ ":*" ]
sources = [
"framework/Flutter.podspec",
]
outputs = [
"$root_out_dir/Flutter.podspec",
]
sources = [ "framework/Flutter.podspec" ]
outputs = [ "$root_out_dir/Flutter.podspec" ]
}
copy("copy_license") {
visibility = [ ":*" ]
sources = [
"//LICENSE",
]
outputs = [
"$root_out_dir/LICENSE",
]
sources = [ "//LICENSE" ]
outputs = [ "$root_out_dir/LICENSE" ]
}
shared_library("copy_and_verify_framework_headers") {
visibility = [ ":*" ]
include_dirs = [ "$_flutter_framework_headers_copy_dir" ]
sources = [
"framework/Source/FlutterUmbrellaImport.m",
]
deps = [
":copy_framework_headers",
]
sources = [ "framework/Source/FlutterUmbrellaImport.m" ]
deps = [ ":copy_framework_headers" ]
}
group("flutter_framework") {

73
engine/src/flutter/shell/platform/darwin/macos/BUILD.gn
View File

@@ -11,9 +11,7 @@ import("//flutter/shell/platform/glfw/config.gni")
import("//flutter/testing/testing.gni")
group("macos") {
deps = [
":flutter_framework",
]
deps = [ ":flutter_framework" ]
if (build_glfw_shell) {
deps += [
":flutter_macos_glfw",
@@ -91,9 +89,7 @@ shared_library("flutter_framework_dylib") {
ldflags = [ "-Wl,-install_name,@rpath/$_flutter_framework_filename/$_framework_binary_subpath" ]
deps = [
":flutter_framework_source",
]
deps = [ ":flutter_framework_source" ]
}
test_fixtures("flutter_desktop_darwin_fixtures") {
@@ -105,9 +101,7 @@ test_fixtures("flutter_desktop_darwin_fixtures") {
executable("flutter_desktop_darwin_unittests") {
testonly = true
sources = [
"framework/Source/FlutterEngineUnittests.mm",
]
sources = [ "framework/Source/FlutterEngineUnittests.mm" ]
cflags_objcc = [ "-fobjc-arc" ]
@@ -126,36 +120,22 @@ executable("flutter_desktop_darwin_unittests") {
copy("copy_dylib") {
visibility = [ ":*" ]
sources = [
"$root_out_dir/lib$_flutter_framework_name.dylib",
]
outputs = [
"$_flutter_framework_dir/$_framework_binary_subpath",
]
sources = [ "$root_out_dir/lib$_flutter_framework_name.dylib" ]
outputs = [ "$_flutter_framework_dir/$_framework_binary_subpath" ]
deps = [
":flutter_framework_dylib",
]
deps = [ ":flutter_framework_dylib" ]
}
copy("copy_framework_info_plist") {
visibility = [ ":*" ]
sources = [
"framework/Info.plist",
]
outputs = [
"$_flutter_framework_dir/Versions/A/Resources/Info.plist",
]
sources = [ "framework/Info.plist" ]
outputs = [ "$_flutter_framework_dir/Versions/A/Resources/Info.plist" ]
}
copy("copy_framework_module_map") {
visibility = [ ":*" ]
sources = [
"framework/module.modulemap",
]
outputs = [
"$_flutter_framework_dir/Versions/A/Modules/module.modulemap",
]
sources = [ "framework/module.modulemap" ]
outputs = [ "$_flutter_framework_dir/Versions/A/Modules/module.modulemap" ]
}
action("copy_framework_headers") {
@@ -177,30 +157,21 @@ action("copy_framework_headers") {
copy("copy_framework_icu") {
visibility = [ ":*" ]
sources = [
"//third_party/icu/flutter/icudtl.dat",
]
outputs = [
"$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}",
]
sources = [ "//third_party/icu/flutter/icudtl.dat" ]
outputs =
[ "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}" ]
}
copy("copy_license") {
visibility = [ ":*" ]
sources = [
"//LICENSE",
]
outputs = [
"$root_out_dir/LICENSE",
]
sources = [ "//LICENSE" ]
outputs = [ "$root_out_dir/LICENSE" ]
}
action("_generate_symlinks") {
visibility = [ ":*" ]
script = "//build/config/mac/package_framework.py"
outputs = [
"$root_build_dir/$_flutter_framework_name.stamp",
]
outputs = [ "$root_build_dir/$_flutter_framework_name.stamp" ]
args = [
"--framework",
"$_flutter_framework_filename",
@@ -226,12 +197,8 @@ action("_generate_symlinks") {
copy("copy_framework_podspec") {
visibility = [ ":*" ]
sources = [
"framework/FlutterMacOS.podspec",
]
outputs = [
"$root_out_dir/FlutterMacOS.podspec",
]
sources = [ "framework/FlutterMacOS.podspec" ]
outputs = [ "$root_out_dir/FlutterMacOS.podspec" ]
}
group("flutter_framework") {
@@ -243,9 +210,7 @@ group("flutter_framework") {
if (build_glfw_shell) {
shared_library("flutter_macos_glfw") {
deps = [
"//flutter/shell/platform/glfw:flutter_glfw",
]
deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ]
public_configs = [ "//flutter:config" ]
}

66
engine/src/flutter/shell/platform/embedder/BUILD.gn
View File

@@ -75,9 +75,7 @@ template("embedder_source_set") {
"//third_party/skia",
]
public_deps = [
":embedder_headers",
]
public_deps = [ ":embedder_headers" ]
public_configs += [ "//flutter:config" ]
}
@@ -92,9 +90,7 @@ embedder_source_set("embedder_as_internal_library") {
}
source_set("embedder_headers") {
public = [
"embedder.h",
]
public = [ "embedder.h" ]
public_configs = [ "//flutter:config" ]
}
@@ -178,21 +174,15 @@ shared_library("flutter_engine_library") {
ldflags = [ "-Wl,-install_name,@rpath/FlutterEmbedder.framework/$_framework_binary_subpath" ]
}
deps = [
":embedder",
]
deps = [ ":embedder" ]
public_configs = [ "//flutter:config" ]
}
copy("copy_headers") {
visibility = [ ":*" ]
sources = [
"embedder.h",
]
outputs = [
"$root_out_dir/flutter_embedder.h",
]
sources = [ "embedder.h" ]
outputs = [ "$root_out_dir/flutter_embedder.h" ]
}
if (is_mac && !embedder_for_target) {
@@ -200,9 +190,7 @@ if (is_mac && !embedder_for_target) {
copy("copy_framework_headers") {
visibility = [ ":*" ]
sources = [
"embedder.h",
]
sources = [ "embedder.h" ]
outputs = [
"$_flutter_embedder_framework_dir/Versions/A/Headers/FlutterEmbedder.h",
]
@@ -210,23 +198,17 @@ if (is_mac && !embedder_for_target) {
copy("copy_icu") {
visibility = [ ":*" ]
sources = [
"//third_party/icu/flutter/icudtl.dat",
]
outputs = [
"$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat",
]
sources = [ "//third_party/icu/flutter/icudtl.dat" ]
outputs =
[ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ]
}
action("copy_info_plist") {
script = "//flutter/build/copy_info_plist.py"
visibility = [ ":*" ]
sources = [
"assets/EmbedderInfo.plist",
]
outputs = [
"$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist",
]
sources = [ "assets/EmbedderInfo.plist" ]
outputs =
[ "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist" ]
args = [
rebase_path(sources[0]),
rebase_path(outputs[0]),
@@ -236,9 +218,7 @@ if (is_mac && !embedder_for_target) {
copy("copy_module_map") {
visibility = [ ":*" ]
sources = [
"assets/embedder.modulemap",
]
sources = [ "assets/embedder.modulemap" ]
outputs = [
"$_flutter_embedder_framework_dir/Versions/A/Modules/module.modulemap",
]
@@ -247,24 +227,16 @@ if (is_mac && !embedder_for_target) {
copy("copy_dylib") {
visibility = [ ":*" ]
sources = [
"$root_out_dir/libflutter_engine.dylib",
]
outputs = [
"$_flutter_embedder_framework_dir/$_framework_binary_subpath",
]
sources = [ "$root_out_dir/libflutter_engine.dylib" ]
outputs = [ "$_flutter_embedder_framework_dir/$_framework_binary_subpath" ]
deps = [
":flutter_engine_library",
]
deps = [ ":flutter_engine_library" ]
}
action("generate_symlinks") {
visibility = [ ":*" ]
script = "//build/config/mac/package_framework.py"
outputs = [
"$root_build_dir/FlutterEmbedder.stamp",
]
outputs = [ "$root_build_dir/FlutterEmbedder.stamp" ]
args = [
"--framework",
"FlutterEmbedder.framework",
@@ -289,9 +261,7 @@ if (is_mac && !embedder_for_target) {
group("flutter_embedder_framework") {
visibility = [ ":*" ]
deps = [
":generate_symlinks",
]
deps = [ ":generate_symlinks" ]
}
}

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

@@ -22,17 +22,13 @@ fuchsia_host_bundle("flutter_binaries") {
_flutter_tester_label = "//flutter/shell/testing:testing($host_toolchain)"
deps = [
_flutter_tester_label,
]
deps = [ _flutter_tester_label ]
_flutter_tester_bin_path =
rebase_path(get_label_info(_flutter_tester_label, "root_out_dir") +
"/flutter_tester")
sources = [
_flutter_tester_bin_path,
]
sources = [ _flutter_tester_bin_path ]
}
fuchsia_host_bundle("dart_binaries") {
@@ -93,7 +89,5 @@ group("fuchsia") {
group("tests") {
testonly = true
deps = [
"flutter:tests",
]
deps = [ "flutter:tests" ]
}

4
engine/src/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn
View File

@@ -9,9 +9,7 @@ config("sdk_ext_config") {
}
group("fuchsia") {
public_deps = [
":sdk_ext",
]
public_deps = [ ":sdk_ext" ]
}
source_set("sdk_ext") {

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

@@ -9,9 +9,7 @@ import("//third_party/dart/utils/compile_platform.gni")
application_snapshot("kernel_compiler") {
main_dart = "compiler.dart"
deps = [
"../flutter/kernel:kernel_platform_files($host_toolchain)",
]
deps = [ "../flutter/kernel:kernel_platform_files($host_toolchain)" ]
dot_packages =
rebase_path("//third_party/dart/.dart_tool/package_config.json")

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

@@ -40,13 +40,13 @@ template("runner") {
dart_deps = []
if (!invoker.product) {
dart_deps += [
"//third_party/dart/runtime/bin:dart_io_api",
"//flutter/shell/platform/fuchsia/runtime/dart/utils:utils",
"//third_party/dart/runtime/bin:dart_io_api",
]
} else {
dart_deps += [
"//third_party/dart/runtime/bin:dart_io_api_product",
"//flutter/shell/platform/fuchsia/runtime/dart/utils:utils_product",
"//third_party/dart/runtime/bin:dart_io_api_product",
]
}
@@ -130,9 +130,7 @@ template("aot_runner_package") {
product_suffix = "_product"
}
fuchsia_archive(target_name) {
deps = [
":dart_aot${product_suffix}_runner_bin",
]
deps = [ ":dart_aot${product_suffix}_runner_bin" ]
if (!invoker.product) {
deps += [
"vmservice:vmservice_snapshot",

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

@@ -35,16 +35,10 @@ template("create_aot_snapshot") {
shim_kernel = get_label_info(shim_target, "target_gen_dir") +
"/shim${product_suffix}_kernel.dill"
inputs = [
shim_kernel,
]
outputs = [
snapshot_assembly,
]
inputs = [ shim_kernel ]
outputs = [ snapshot_assembly ]
deps = [
shim_target,
]
deps = [ shim_target ]
if (invoker.product) {
tool = gen_snapshot_product
} else {
@@ -70,9 +64,7 @@ template("create_aot_snapshot") {
}
source_set(target_name) {
deps = [
":${target_name}_assembly",
]
deps = [ ":${target_name}_assembly" ]
sources = [
"$target_gen_dir/aot${product_suffix}_vm_snapshot.S",

20
engine/src/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn
View File

@@ -6,9 +6,7 @@ import("//build/testing/environments.gni")
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_jit_app("goodbye_dart_jit") {
sources = [
"goodbye_dart.dart",
]
sources = [ "goodbye_dart.dart" ]
main_dart = "goodbye_dart.dart"
source_dir = "."
@@ -26,9 +24,7 @@ dart_jit_app("goodbye_dart_jit") {
}
dart_aot_app("goodbye_dart_aot") {
sources = [
"goodbye_dart.dart",
]
sources = [ "goodbye_dart.dart" ]
main_dart = "goodbye_dart.dart"
source_dir = "."
@@ -46,12 +42,8 @@ dart_aot_app("goodbye_dart_aot") {
}
copy("copy_goodbye_dart_test") {
sources = [
"goodbye_dart_test",
]
outputs = [
"${root_build_dir}/goodbye_dart_test",
]
sources = [ "goodbye_dart_test" ]
outputs = [ "${root_build_dir}/goodbye_dart_test" ]
}
package("goodbye_dart_test") {
@@ -62,7 +54,5 @@ package("goodbye_dart_test") {
environments = basic_envs
},
]
deps = [
":copy_goodbye_dart_test",
]
deps = [ ":copy_goodbye_dart_test" ]
}

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

@@ -7,9 +7,7 @@ import("//build/dart/dart_library.gni")
dart_library("greeting") {
infer_package_name = true
sources = [
"greeting.dart",
]
sources = [ "greeting.dart" ]
source_dir = "."
}

4
engine/src/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn
View File

@@ -7,7 +7,5 @@ import("//build/fidl/fidl.gni")
fidl("interfaces") {
name = "fuchsia.examples.hello"
sources = [
"hello.fidl",
]
sources = [ "hello.fidl" ]
}

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

@@ -39,9 +39,7 @@ template("create_kernel_core_snapshot") {
}
compiled_action(target_name) {
deps = [
":kernel_platform_files",
]
deps = [ ":kernel_platform_files" ]
platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill"
compilation_trace =

12
engine/src/flutter/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn
View File

@@ -42,19 +42,13 @@ template("aot_snapshot") {
shim_kernel = get_label_info(shim_target, "target_gen_dir") +
"/vmservice${product_suffix}_aot_kernel.dill"
deps = [
shim_target,
]
deps = [ shim_target ]
snapshot_path = "$target_gen_dir/${kernel_name}_snapshot.so"
inputs = [
shim_kernel,
]
inputs = [ shim_kernel ]
outputs = [
snapshot_path,
]
outputs = [ snapshot_path ]
if (product) {
tool = gen_snapshot_product

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

@@ -184,9 +184,7 @@ template("aot_runner") {
}
fuchsia_archive(target_name) {
deps = [
":aot${product_suffix}",
]
deps = [ ":aot${product_suffix}" ]
if (!product) {
deps += [
@@ -444,9 +442,7 @@ executable("flutter_runner_scenic_unittests") {
"//third_party/skia",
]
public_deps = [
"//third_party/googletest:gtest",
]
public_deps = [ "//third_party/googletest:gtest" ]
}
# When adding a new dep here, please also ensure the dep is added to
@@ -454,9 +450,7 @@ executable("flutter_runner_scenic_unittests") {
fuchsia_archive("flutter_runner_tests") {
testonly = true
deps = [
":flutter_runner_unittests",
]
deps = [ ":flutter_runner_unittests" ]
binary = "$target_name"
@@ -497,9 +491,7 @@ fuchsia_archive("flutter_runner_tests") {
fuchsia_archive("flutter_runner_tzdata_tests") {
testonly = true
deps = [
":flutter_runner_tzdata_unittests",
]
deps = [ ":flutter_runner_tzdata_unittests" ]
binary = "$target_name"
@@ -525,9 +517,7 @@ fuchsia_archive("flutter_runner_tzdata_tests") {
fuchsia_archive("flutter_runner_scenic_tests") {
testonly = true
deps = [
":flutter_runner_scenic_unittests",
]
deps = [ ":flutter_runner_scenic_unittests" ]
binary = "$target_name"
@@ -551,17 +541,13 @@ fuchsia_archive("flutter_runner_scenic_tests") {
}
fuchsia_test_archive("fml_tests") {
deps = [
"//flutter/fml:fml_unittests",
]
deps = [ "//flutter/fml:fml_unittests" ]
binary = "fml_unittests"
}
fuchsia_test_archive("flow_tests") {
deps = [
"//flutter/flow:flow_unittests",
]
deps = [ "//flutter/flow:flow_unittests" ]
binary = "flow_unittests"
@@ -585,9 +571,7 @@ fuchsia_test_archive("flow_tests") {
}
fuchsia_test_archive("flow_tests_next") {
deps = [
"//flutter/flow:flow_unittests_next",
]
deps = [ "//flutter/flow:flow_unittests_next" ]
binary = "flow_unittests_next"
@@ -703,17 +687,13 @@ fuchsia_test_archive("shell_tests_next") {
}
fuchsia_test_archive("testing_tests") {
deps = [
"//flutter/testing:testing_unittests",
]
deps = [ "//flutter/testing:testing_unittests" ]
binary = "testing_unittests"
}
fuchsia_test_archive("txt_tests") {
deps = [
"//flutter/third_party/txt:txt_unittests",
]
deps = [ "//flutter/third_party/txt:txt_unittests" ]
binary = "txt_unittests"

2
engine/src/flutter/shell/platform/fuchsia/flutter/engine_flutter_runner.gni
View File

@@ -93,8 +93,8 @@ template("flutter_runner") {
"../flutter:fuchsia_legacy_gpu_configuration",
"//flutter/assets",
"//flutter/common",
"//flutter/fml",
"//flutter/flow:flow_fuchsia_legacy",
"//flutter/fml",
"//flutter/lib/ui:ui_fuchsia_legacy",
"//flutter/runtime:runtime_fuchsia_legacy",
"//flutter/shell/common:common_fuchsia_legacy",

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

@@ -42,9 +42,7 @@ template("core_snapshot") {
}
compiled_action(target_name) {
deps = [
":kernel_platform_files",
]
deps = [ ":kernel_platform_files" ]
platform_dill =
"$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"

12
engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn
View File

@@ -11,15 +11,9 @@ template("generate_dart_profiler_symbols") {
assert(defined(invoker.output), "Must define 'output'")
prebuilt_dart_action(target_name) {
deps = [
invoker.library_label,
]
inputs = [
invoker.library_path,
]
outputs = [
invoker.output,
]
deps = [ invoker.library_label ]
inputs = [ invoker.library_path ]
outputs = [ invoker.output ]
script = "dart_profiler_symbols.dart"

8
engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn
View File

@@ -51,13 +51,9 @@ template("make_utils") {
}
make_utils("utils") {
deps = [
"//third_party/dart/runtime/bin:elf_loader",
]
deps = [ "//third_party/dart/runtime/bin:elf_loader" ]
}
make_utils("utils_product") {
deps = [
"//third_party/dart/runtime/bin:elf_loader_product",
]
deps = [ "//third_party/dart/runtime/bin:elf_loader_product" ]
}

13
engine/src/flutter/shell/platform/glfw/BUILD.gn
View File

@@ -17,9 +17,8 @@ config("relative_flutter_glfw_headers") {
source_set("flutter_glfw_headers") {
public = _public_headers
public_deps = [
"//flutter/shell/platform/common/cpp:common_cpp_library_headers",
]
public_deps =
[ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
configs +=
[ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
@@ -74,12 +73,8 @@ source_set("flutter_glfw") {
copy("publish_headers_glfw") {
sources = _public_headers
outputs = [
"$root_out_dir/{{source_file_part}}",
]
outputs = [ "$root_out_dir/{{source_file_part}}" ]
# The GLFW header assumes the presence of the common headers.
deps = [
"//flutter/shell/platform/common/cpp:publish_headers",
]
deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ]
}

4
engine/src/flutter/shell/platform/glfw/client_wrapper/BUILD.gn
View File

@@ -62,9 +62,7 @@ source_set("client_wrapper_library_stubs_glfw") {
defines = [ "FLUTTER_DESKTOP_LIBRARY" ]
public_deps = [
"//flutter/shell/platform/glfw:flutter_glfw_headers",
]
public_deps = [ "//flutter/shell/platform/glfw:flutter_glfw_headers" ]
}
test_fixtures("client_wrapper_glfw_fixtures") {

20
engine/src/flutter/shell/platform/linux/BUILD.gn
View File

@@ -33,9 +33,7 @@ config("disable_fatal_link_warnings") {
if (build_glfw_shell) {
shared_library("flutter_linux_glfw") {
deps = [
"//flutter/shell/platform/glfw:flutter_glfw",
]
deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ]
configs += [ ":disable_fatal_link_warnings" ]
@@ -122,13 +120,9 @@ source_set("flutter_linux") {
"//third_party/khronos:khronos_headers",
]
public_deps = [
":flutter_linux_sources",
]
public_deps = [ ":flutter_linux_sources" ]
deps = [
"//flutter/shell/platform/embedder:embedder_as_internal_library",
]
deps = [ "//flutter/shell/platform/embedder:embedder_as_internal_library" ]
}
test_fixtures("flutter_linux_fixtures") {
@@ -177,16 +171,12 @@ executable("flutter_linux_unittests") {
}
shared_library("flutter_linux_gtk") {
deps = [
":flutter_linux",
]
deps = [ ":flutter_linux" ]
public_configs = [ "//flutter:config" ]
}
copy("publish_headers_linux") {
sources = _public_headers
outputs = [
"$root_out_dir/flutter_linux/{{source_file_part}}",
]
outputs = [ "$root_out_dir/flutter_linux/{{source_file_part}}" ]
}

27
engine/src/flutter/shell/platform/windows/BUILD.gn
View File

@@ -26,9 +26,8 @@ config("relative_flutter_windows_headers") {
source_set("flutter_windows_headers") {
public = _public_headers
public_deps = [
"//flutter/shell/platform/common/cpp:common_cpp_library_headers",
]
public_deps =
[ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ]
configs +=
[ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ]
@@ -82,7 +81,11 @@ source_set("flutter_windows_source") {
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper",
"//flutter/shell/platform/embedder:embedder_as_internal_library",
"//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows",
"//third_party/angle:libEGL_static", # the order of libEGL_static and libGLESv2_static is important.. if reversed, will cause a linker error DllMain already defined in LIBCMTD.lib
"//third_party/angle:libEGL_static", # the order of libEGL_static and
# libGLESv2_static is important.. if
# reversed, will cause a linker error
# DllMain already defined in
# LIBCMTD.lib
"//third_party/angle:libGLESv2_static",
"//third_party/rapidjson",
]
@@ -90,20 +93,14 @@ source_set("flutter_windows_source") {
copy("publish_headers_windows") {
sources = _public_headers
outputs = [
"$root_out_dir/{{source_file_part}}",
]
outputs = [ "$root_out_dir/{{source_file_part}}" ]
# The Windows header assumes the presence of the common headers.
deps = [
"//flutter/shell/platform/common/cpp:publish_headers",
]
deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ]
}
shared_library("flutter_windows") {
deps = [
":flutter_windows_source",
]
deps = [ ":flutter_windows_source" ]
public_configs = [ "//flutter:config" ]
}
@@ -138,9 +135,7 @@ executable("flutter_windows_unittests") {
}
shared_library("flutter_windows_glfw") {
deps = [
"//flutter/shell/platform/glfw:flutter_glfw",
]
deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ]
public_configs = [ "//flutter:config" ]
}

4
engine/src/flutter/shell/platform/windows/client_wrapper/BUILD.gn
View File

@@ -57,9 +57,7 @@ source_set("client_wrapper_library_stubs_windows") {
defines = [ "FLUTTER_DESKTOP_LIBRARY" ]
public_deps = [
"//flutter/shell/platform/windows:flutter_windows_headers",
]
public_deps = [ "//flutter/shell/platform/windows:flutter_windows_headers" ]
}
test_fixtures("client_wrapper_windows_fixtures") {

4
engine/src/flutter/shell/testing/BUILD.gn
View File

@@ -12,9 +12,7 @@ executable("testing") {
"//flutter:export_dynamic_symbols",
]
sources = [
"tester_main.cc",
]
sources = [ "tester_main.cc" ]
deps = [
"//flutter/assets",

32
engine/src/flutter/sky/dist/BUILD.gn vendored
View File

@@ -11,12 +11,8 @@ if (is_android) {
source = "//flutter/sky/packages/flutter_services"
dest = "$root_build_dir/dist/packages/flutter_services"
inputs = [
source,
]
outputs = [
dest,
]
inputs = [ source ]
outputs = [ dest ]
args = [
"--source",
@@ -25,9 +21,7 @@ if (is_android) {
rebase_path(dest),
]
deps = [
"//flutter/sky/packages/flutter_services",
]
deps = [ "//flutter/sky/packages/flutter_services" ]
}
action("sky_engine") {
script = "//flutter/sky/tools/dist_dart_pkg.py"
@@ -35,12 +29,8 @@ if (is_android) {
source = "$root_gen_dir/dart-pkg/sky_engine"
dest = "$root_build_dir/dist/packages/sky_engine"
inputs = [
source,
]
outputs = [
dest,
]
inputs = [ source ]
outputs = [ dest ]
args = [
"--source",
@@ -61,12 +51,8 @@ if (is_android) {
source = "$root_gen_dir/dart-pkg/sky_services"
dest = "$root_build_dir/dist/packages/sky_services"
inputs = [
source,
]
outputs = [
dest,
]
inputs = [ source ]
outputs = [ dest ]
args = [
"--source",
@@ -107,8 +93,6 @@ if (is_android) {
group("dist") {
if (is_android) {
deps = [
":zip",
]
deps = [ ":zip" ]
}
}

4
engine/src/flutter/sky/packages/flutter_services/BUILD.gn
View File

@@ -3,7 +3,5 @@
# found in the LICENSE file.
group("flutter_services") {
deps = [
"//flutter/sky/packages/sky_services",
]
deps = [ "//flutter/sky/packages/sky_services" ]
}

83
engine/src/flutter/sky/packages/sky_engine/BUILD.gn
View File

@@ -26,13 +26,9 @@ import("//third_party/dart/sdk/lib/wasm/wasm_sources.gni")
if (!is_fuchsia) {
copy("copy_sky_engine_authors") {
sources = [
"//AUTHORS",
]
sources = [ "//AUTHORS" ]
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}" ]
}
}
@@ -41,9 +37,8 @@ dart_sdk_lib_path = rebase_path("//third_party/dart/sdk/lib")
copy("async") {
lib_path = rebase_path("async", "", dart_sdk_lib_path)
sources = rebase_path(async_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}" ]
}
copy("collection") {
@@ -57,33 +52,29 @@ copy("collection") {
copy("convert") {
lib_path = rebase_path("convert", "", dart_sdk_lib_path)
sources = rebase_path(convert_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}" ]
}
copy("core") {
lib_path = rebase_path("core", "", dart_sdk_lib_path)
sources = rebase_path(core_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}" ]
}
copy("developer") {
lib_path = rebase_path("developer", "", dart_sdk_lib_path)
sources = rebase_path(developer_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}" ]
}
copy("_http") {
lib_path = rebase_path("_http", "", dart_sdk_lib_path)
sources = rebase_path(http_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}" ]
}
copy("_interceptors") {
@@ -97,65 +88,54 @@ copy("_interceptors") {
copy("internal") {
lib_path = rebase_path("internal", "", dart_sdk_lib_path)
sources = rebase_path(internal_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}" ]
}
copy("io") {
lib_path = rebase_path("io", "", dart_sdk_lib_path)
sources = rebase_path(io_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}" ]
}
copy("ffi") {
lib_path = rebase_path("ffi", "", dart_sdk_lib_path)
sources = rebase_path(ffi_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}" ]
}
copy("html") {
lib_path = rebase_path("html", "", dart_sdk_lib_path)
sources = rebase_path(html_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/html/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/html/{{source_file_part}}" ]
}
copy("isolate") {
lib_path = rebase_path("isolate", "", dart_sdk_lib_path)
sources = rebase_path(isolate_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}" ]
}
copy("js") {
lib_path = rebase_path("js", "", dart_sdk_lib_path)
sources = rebase_path(js_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/js/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/js/{{source_file_part}}" ]
}
copy("js_util") {
lib_path = rebase_path("js_util", "", dart_sdk_lib_path)
sources = rebase_path(js_util_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/js_util/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/js_util/{{source_file_part}}" ]
}
copy("math") {
lib_path = rebase_path("math", "", dart_sdk_lib_path)
sources = rebase_path(math_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}" ]
}
copy("typed_data") {
@@ -169,23 +149,18 @@ copy("typed_data") {
copy("wasm") {
lib_path = rebase_path("wasm", "", dart_sdk_lib_path)
sources = rebase_path(wasm_sdk_sources, "", lib_path)
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}",
]
outputs =
[ "$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}" ]
}
copy("copy_dart_ui") {
sources = dart_ui_files
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}" ]
}
copy("copy_allowed_experiments") {
sources = [
"//third_party/dart/sdk/lib/_internal/allowed_experiments.json",
]
sources = [ "//third_party/dart/sdk/lib/_internal/allowed_experiments.json" ]
outputs = [
"$root_gen_dir/dart-pkg/sky_engine/lib/_internal/allowed_experiments.json",

8
engine/src/flutter/sky/packages/sky_services/BUILD.gn
View File

@@ -11,9 +11,7 @@ if (!is_fuchsia) {
"//LICENSE",
]
outputs = [
"$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}",
]
outputs = [ "$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}" ]
}
}
@@ -24,8 +22,6 @@ dart_pkg("sky_services") {
]
if (!is_fuchsia) {
deps = [
":copy_sky_services_license",
]
deps = [ ":copy_sky_services_license" ]
}
}

8
engine/src/flutter/testing/BUILD.gn
View File

@@ -36,9 +36,7 @@ source_set("testing") {
"test_timeout_listener.h",
]
public_deps = [
":testing_lib",
]
public_deps = [ ":testing_lib" ]
}
source_set_maybe_fuchsia_legacy("dart") {
@@ -90,9 +88,7 @@ source_set_maybe_fuchsia_legacy("fixture_test") {
"fixture_test.h",
]
public_deps = [
"//flutter/common",
]
public_deps = [ "//flutter/common" ]
public_deps_legacy_and_next = [
":dart",

28
engine/src/flutter/testing/testing.gni
View File

@@ -35,9 +35,7 @@ template("fixtures_location") {
source_set(target_name) {
public = []
sources = [
location_source_path,
]
sources = [ location_source_path ]
}
}
@@ -70,13 +68,9 @@ template("dart_snapshot_kernel") {
script = "$root_out_dir/frontend_server.dart.snapshot"
inputs = [
invoker.dart_main,
]
inputs = [ invoker.dart_main ]
outputs = [
invoker.dart_kernel,
]
outputs = [ invoker.dart_kernel ]
snapshot_depfile = "$target_gen_dir/snapshot_$target_name.depfile.d"
depfile = snapshot_depfile
@@ -126,16 +120,12 @@ template("dart_snapshot_aot") {
tool = "//third_party/dart/runtime/bin:gen_snapshot"
inputs = [
invoker.dart_kernel,
]
inputs = [ invoker.dart_kernel ]
# Custom ELF loader is used for Mac and Windows.
elf_object = "$target_gen_dir/assets/app_elf_snapshot.so"
outputs = [
elf_object,
]
outputs = [ elf_object ]
args = [
"--no-causal_async_stacks",
@@ -175,9 +165,7 @@ template("dart_snapshot") {
dart_snapshot_aot_target_name = "_dsa_$target_name"
dart_snapshot_aot(dart_snapshot_aot_target_name) {
dart_kernel = dart_snapshot_kernel_path
deps = [
":$dart_snapshot_kernel_target_name",
]
deps = [ ":$dart_snapshot_kernel_target_name" ]
}
snapshot_deps += [ ":$dart_snapshot_aot_target_name" ]
}
@@ -208,9 +196,7 @@ template("copy_fixtures") {
if (has_fixtures) {
copy(target_name) {
sources = invoker.fixtures
outputs = [
"$target_gen_dir/assets/{{source_file_part}}",
]
outputs = [ "$target_gen_dir/assets/{{source_file_part}}" ]
}
} else {
group(target_name) {

8
engine/src/flutter/third_party/tonic/converter/BUILD.gn vendored
View File

@@ -12,11 +12,7 @@ source_set("converter") {
"dart_converter.h",
]
deps = [
"../common",
]
deps = [ "../common" ]
public_deps = [
"//third_party/dart/runtime:dart_api",
]
public_deps = [ "//third_party/dart/runtime:dart_api" ]
}

4
engine/src/flutter/third_party/tonic/filesystem/BUILD.gn vendored
View File

@@ -3,7 +3,5 @@
# found in the LICENSE file.
group("filesystem") {
public_deps = [
"filesystem",
]
public_deps = [ "filesystem" ]
}

4
engine/src/flutter/third_party/tonic/filesystem/filesystem/BUILD.gn vendored
View File

@@ -29,9 +29,7 @@ source_set("filesystem") {
sources += [ "path_posix.cc" ]
}
deps = [
"../../common",
]
deps = [ "../../common" ]
public_configs = [ ":filesystem_config" ]
}

4
engine/src/flutter/third_party/tonic/filesystem/tests/BUILD.gn vendored
View File

@@ -14,7 +14,5 @@ executable("files_unittests") {
"scoped_temp_dir_unittest.cc",
]
deps = [
":../:filesystem",
]
deps = [ ":../:filesystem" ]
}

4
engine/src/flutter/third_party/tonic/logging/BUILD.gn vendored
View File

@@ -19,7 +19,5 @@ source_set("logging") {
"../converter",
]
public_deps = [
"//third_party/dart/runtime:dart_api",
]
public_deps = [ "//third_party/dart/runtime:dart_api" ]
}

4
engine/src/flutter/third_party/tonic/parsers/BUILD.gn vendored
View File

@@ -7,9 +7,7 @@ source_set("parsers") {
configs += [ "../:config" ]
deps = [
"../common",
]
deps = [ "../common" ]
sources = [
"packages_map.cc",

8
engine/src/flutter/third_party/tonic/scopes/BUILD.gn vendored
View File

@@ -13,11 +13,7 @@ source_set("scopes") {
"dart_isolate_scope.h",
]
deps = [
"../common",
]
deps = [ "../common" ]
public_deps = [
"//third_party/dart/runtime:dart_api",
]
public_deps = [ "//third_party/dart/runtime:dart_api" ]
}

4
engine/src/flutter/third_party/tonic/typed_data/BUILD.gn vendored
View File

@@ -21,9 +21,7 @@ source_set("typed_data") {
"uint8_list.h",
]
deps = [
"../common",
]
deps = [ "../common" ]
public_deps = [
"../converter",

6
engine/src/flutter/third_party/txt/BUILD.gn vendored
View File

@@ -143,9 +143,7 @@ source_set("txt") {
"//third_party/skia",
]
deps = [
"//third_party/skia",
]
deps = [ "//third_party/skia" ]
if (flutter_use_fontconfig) {
deps += [ "//third_party/fontconfig" ]
@@ -180,8 +178,8 @@ source_set("txt") {
if (enable_unittests) {
txt_common_executable_deps = [
"//third_party/dart/runtime:libdart_jit", # For logging.
"//flutter/fml", # For ICU initialization.
"//third_party/dart/runtime:libdart_jit", # For logging.
]
test_fixtures("txt_fixtures") {

4
engine/src/flutter/tools/const_finder/BUILD.gn
View File

@@ -16,7 +16,5 @@ application_snapshot("const_finder") {
".dart_tool/package_config.json",
]
deps = [
"//flutter/flutter_frontend_server:frontend_server",
]
deps = [ "//flutter/flutter_frontend_server:frontend_server" ]
}

4
engine/src/flutter/tools/font-subset/BUILD.gn
View File

@@ -8,9 +8,7 @@ executable("font-subset") {
"main.cc",
]
deps = [
"//third_party/harfbuzz",
]
deps = [ "//third_party/harfbuzz" ]
libs = []
if (is_mac) {

8
engine/src/flutter/tools/fuchsia/dart_kernel.gni
View File

@@ -14,9 +14,7 @@ template("dart_kernel") {
main_dart = rebase_path(invoker.main_dart)
deps = [
invoker.kernel_platform_files,
]
deps = [ invoker.kernel_platform_files ]
gen_kernel_script = "//third_party/dart/pkg/vm/bin/gen_kernel.dart"
platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill"
@@ -32,9 +30,7 @@ template("dart_kernel") {
]
output = "$target_gen_dir/$target_name.dill"
outputs = [
output,
]
outputs = [ output ]
depfile = "$output.d"
abs_depfile = rebase_path(depfile)

8
engine/src/flutter/tools/fuchsia/fuchsia_archive.gni
View File

@@ -64,12 +64,8 @@ template("fuchsia_archive") {
}
copy("$cmx_target") {
sources = [
"$cmx_file",
]
outputs = [
"$far_base_dir/meta/${pkg_target_name}.cmx",
]
sources = [ "$cmx_file" ]
outputs = [ "$far_base_dir/meta/${pkg_target_name}.cmx" ]
}
write_file("${far_base_dir}/meta/package",

8
engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni
View File

@@ -21,9 +21,7 @@ template("_copy_debug_symbols") {
script = "//flutter/tools/fuchsia/copy_debug_symbols.py"
sources = [
binary_path,
]
sources = [ binary_path ]
_dest_base = "${root_out_dir}/flutter-debug-symbols-${flutter_runtime_mode}-${target_os}-${target_cpu}"
@@ -42,9 +40,7 @@ template("_copy_debug_symbols") {
args += [ "--unstripped" ]
}
outputs = [
"${_dest_base}/.${target_name}_success",
]
outputs = [ "${_dest_base}/.${target_name}_success" ]
}
}

4
engine/src/flutter/tools/fuchsia/fuchsia_host_bundle.gni
View File

@@ -17,8 +17,6 @@ template("fuchsia_host_bundle") {
sources = invoker.sources
outputs = [
"${_dest_dir}/{{source_file_part}}",
]
outputs = [ "${_dest_dir}/{{source_file_part}}" ]
}
}

24
engine/src/flutter/web_sdk/BUILD.gn
View File

@@ -52,9 +52,7 @@ prebuilt_dart_action("web_ui_sources") {
output_dir = rebase_path("$root_out_dir/flutter_web_sdk/lib/ui/")
input_dir = rebase_path("//flutter/lib/web_ui/lib/")
outputs = [
"$target_gen_dir/$target_name.stamp",
]
outputs = [ "$target_gen_dir/$target_name.stamp" ]
args = [
"--output-dir=$output_dir",
@@ -78,9 +76,7 @@ prebuilt_dart_action("web_engine_sources") {
output_dir = rebase_path("$root_out_dir/flutter_web_sdk/lib/_engine/")
input_dir = rebase_path("//flutter/lib/web_ui/lib/src/")
outputs = [
"$target_gen_dir/$target_name.stamp",
]
outputs = [ "$target_gen_dir/$target_name.stamp" ]
args = [
"--output-dir=$output_dir",
@@ -97,13 +93,9 @@ prebuilt_dart_action("web_engine_sources") {
}
copy("web_ui_library") {
sources = [
"//flutter/web_sdk/libraries.json",
]
sources = [ "//flutter/web_sdk/libraries.json" ]
outputs = [
"$root_out_dir/flutter_web_sdk/{{source_file_part}}",
]
outputs = [ "$root_out_dir/flutter_web_sdk/{{source_file_part}}" ]
}
# Compile the DDC SDK's summary.
@@ -117,9 +109,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources
outputs = [
sdk_dill,
]
outputs = [ sdk_dill ]
script = "//third_party/dart/utils/bazel/kernel_worker.dart"
@@ -373,9 +363,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline_sound") {
inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources
outputs = [
sdk_dill_sound,
]
outputs = [ sdk_dill_sound ]
script = "//third_party/dart/utils/bazel/kernel_worker.dart"