提交 b03af318 编写于 作者: C Chinmay Garde 提交者: GitHub

Re-format all GN files using `gn format`. (#3319)

上级 847ee8d7
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
group("flutter") { group("flutter") {
testonly = true testonly = true
deps = [ "//flutter/sky" ] deps = [
"//flutter/sky",
]
if (is_fuchsia) { if (is_fuchsia) {
deps += [ deps += [
...@@ -29,7 +31,6 @@ group("flutter") { ...@@ -29,7 +31,6 @@ group("flutter") {
} }
if (!is_fuchsia) { if (!is_fuchsia) {
group("dist") { group("dist") {
testonly = true testonly = true
...@@ -37,5 +38,4 @@ if (!is_fuchsia) { ...@@ -37,5 +38,4 @@ if (!is_fuchsia) {
"//flutter/sky/dist", "//flutter/sky/dist",
] ]
} }
} }
...@@ -204,9 +204,8 @@ template("dart_packages") { ...@@ -204,9 +204,8 @@ template("dart_packages") {
} }
# Determine list of packages. # Determine list of packages.
list_script = rebase_path("build/dart/dart/tools/fetch_dart_packages.py", list_script =
".", rebase_path("build/dart/dart/tools/fetch_dart_packages.py", ".", "//")
"//")
packages = exec_script(list_script, packages = exec_script(list_script,
[ [
"--directory", "--directory",
......
...@@ -38,7 +38,13 @@ template("flutter_app") { ...@@ -38,7 +38,13 @@ template("flutter_app") {
dart_package_name = target_name + "_dart_package" dart_package_name = target_name + "_dart_package"
dart_package(dart_package_name) { dart_package(dart_package_name) {
forward_variables_from(invoker, [ "analysis_options", "deps", "disable_analysis", "source_dir" ]) forward_variables_from(invoker,
[
"analysis_options",
"deps",
"disable_analysis",
"source_dir",
])
if (defined(invoker.package_name)) { if (defined(invoker.package_name)) {
package_name = invoker.package_name package_name = invoker.package_name
} else { } else {
...@@ -108,7 +114,6 @@ template("flutter_app") { ...@@ -108,7 +114,6 @@ template("flutter_app") {
rebase_path(depfile_path), rebase_path(depfile_path),
"--build-output", "--build-output",
rebase_path(snapshot_path, root_build_dir), rebase_path(snapshot_path, root_build_dir),
] ]
deps = [ deps = [
...@@ -160,7 +165,7 @@ template("flutter_app") { ...@@ -160,7 +165,7 @@ template("flutter_app") {
if (defined(invoker.manifest)) { if (defined(invoker.manifest)) {
args += [ args += [
"--manifest", "--manifest",
rebase_path(invoker.manifest) rebase_path(invoker.manifest),
] ]
} }
......
...@@ -20,7 +20,5 @@ source_set("common") { ...@@ -20,7 +20,5 @@ source_set("common") {
"//lib/ftl", "//lib/ftl",
] ]
public_configs = [ public_configs = [ ":flutter_config" ]
":flutter_config"
]
} }
...@@ -28,8 +28,8 @@ executable("content_handler") { ...@@ -28,8 +28,8 @@ executable("content_handler") {
"//apps/mozart/services/input", "//apps/mozart/services/input",
"//apps/mozart/services/views", "//apps/mozart/services/views",
"//apps/tracing/lib/trace:provider", "//apps/tracing/lib/trace:provider",
"//dart/runtime/vm:libdart_platform",
"//dart/runtime:libdart", "//dart/runtime:libdart",
"//dart/runtime/vm:libdart_platform",
"//flutter/assets", "//flutter/assets",
"//flutter/common", "//flutter/common",
"//flutter/flow", "//flutter/flow",
......
...@@ -13,9 +13,7 @@ source_set("glue") { ...@@ -13,9 +13,7 @@ source_set("glue") {
] ]
if (is_fuchsia || is_fuchsia_host) { if (is_fuchsia || is_fuchsia_host) {
sources += [ sources += [ "stack_trace_fuchsia.cc" ]
"stack_trace_fuchsia.cc",
]
public_deps = [ public_deps = [
"//apps/tracing/lib/trace", "//apps/tracing/lib/trace",
...@@ -27,8 +25,6 @@ source_set("glue") { ...@@ -27,8 +25,6 @@ source_set("glue") {
"task_runner_adaptor.h", "task_runner_adaptor.h",
] ]
deps += [ deps += [ "//base" ]
"//base",
]
} }
} }
...@@ -39,15 +39,14 @@ action("generate_snapshot_bin") { ...@@ -39,15 +39,14 @@ action("generate_snapshot_bin") {
} }
deps = [ deps = [
"//dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
":generate_dart_ui",
":generate_dart_jni", ":generate_dart_jni",
":generate_dart_ui",
"//dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
] ]
inputs = [ inputs = [
"//dart/runtime/tools/create_snapshot_bin.py", "//dart/runtime/tools/create_snapshot_bin.py",
snapshot_dart, snapshot_dart,
] + dart_ui_files ] + dart_ui_files + dart_jni_files
+ dart_jni_files
vm_isolate_snapshot = "$target_gen_dir/vm_isolate_snapshot.bin" vm_isolate_snapshot = "$target_gen_dir/vm_isolate_snapshot.bin"
isolate_snapshot = "$target_gen_dir/isolate_snapshot.bin" isolate_snapshot = "$target_gen_dir/isolate_snapshot.bin"
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//flutter/common/config.gni") # for flutter_aot import("//flutter/common/config.gni") # for flutter_aot
if (target_os == "ios") { if (target_os == "ios") {
import("//build/config/ios/ios_sdk.gni") # For use_ios_simulator import("//build/config/ios/ios_sdk.gni") # For use_ios_simulator
} }
dart_host_toolchain = host_toolchain dart_host_toolchain = host_toolchain
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
source_set("ui") { source_set("ui") {
sources = [ sources = [
"compositing/scene_builder.cc",
"compositing/scene_builder.h",
"compositing/scene.cc", "compositing/scene.cc",
"compositing/scene.h", "compositing/scene.h",
"compositing/scene_builder.cc",
"compositing/scene_builder.h",
"dart_runtime_hooks.cc", "dart_runtime_hooks.cc",
"dart_runtime_hooks.h", "dart_runtime_hooks.h",
"dart_ui.cc", "dart_ui.cc",
...@@ -57,12 +57,12 @@ source_set("ui") { ...@@ -57,12 +57,12 @@ source_set("ui") {
"text/text_box.h", "text/text_box.h",
"ui_dart_state.cc", "ui_dart_state.cc",
"ui_dart_state.h", "ui_dart_state.h",
"window/platform_message_response_dart.cc",
"window/platform_message_response_dart.h",
"window/platform_message_response.cc",
"window/platform_message_response.h",
"window/platform_message.cc", "window/platform_message.cc",
"window/platform_message.h", "window/platform_message.h",
"window/platform_message_response.cc",
"window/platform_message_response.h",
"window/platform_message_response_dart.cc",
"window/platform_message_response_dart.h",
"window/pointer_data.cc", "window/pointer_data.cc",
"window/pointer_data.h", "window/pointer_data.h",
"window/pointer_data_packet.cc", "window/pointer_data_packet.cc",
......
...@@ -5,37 +5,44 @@ ...@@ -5,37 +5,44 @@
import("//flutter/common/config.gni") import("//flutter/common/config.gni")
vmservice_sources_gypi = vmservice_sources_gypi =
exec_script("//build/gypi_to_gn.py", exec_script(
[ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ], "//build/gypi_to_gn.py",
"scope", [ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ],
[ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ]) "scope",
[ rebase_path("//dart/runtime/bin/vmservice/vmservice_sources.gypi") ])
action("gen_embedded_resources_cc") { action("gen_embedded_resources_cc") {
script = "//dart/runtime/tools/create_resources.py" script = "//dart/runtime/tools/create_resources.py"
output_file = "$target_gen_dir/embedded_resources.cc" output_file = "$target_gen_dir/embedded_resources.cc"
outputs = [ output_file ] outputs = [
output_file,
]
inputs = rebase_path(vmservice_sources_gypi.sources, inputs = rebase_path(vmservice_sources_gypi.sources,
"", "",
"//dart/runtime/bin/vmservice") "//dart/runtime/bin/vmservice")
args = [ args = [
"--output", "--output",
rebase_path(output_file), rebase_path(output_file),
"--outer_namespace", "--outer_namespace",
"flutter", "flutter",
"--inner_namespace", "--inner_namespace",
"runtime", "runtime",
"--table_name", "--table_name",
"flutter_embedded_service_isolate", "flutter_embedded_service_isolate",
"--root_prefix", "--root_prefix",
rebase_path("//dart/runtime/bin/"), rebase_path("//dart/runtime/bin/"),
] + rebase_path(inputs) ] + rebase_path(inputs)
} }
source_set("embedded_resources_cc") { source_set("embedded_resources_cc") {
sources = [ "$target_gen_dir/embedded_resources.cc" ] sources = [
deps = [ ":gen_embedded_resources_cc" ] "$target_gen_dir/embedded_resources.cc",
]
deps = [
":gen_embedded_resources_cc",
]
} }
source_set("runtime") { source_set("runtime") {
...@@ -67,8 +74,9 @@ source_set("runtime") { ...@@ -67,8 +74,9 @@ source_set("runtime") {
] ]
deps = [ deps = [
"//dart/runtime/bin:embedded_dart_io", ":embedded_resources_cc",
"//dart/runtime:libdart", "//dart/runtime:libdart",
"//dart/runtime/bin:embedded_dart_io",
"//flutter/assets", "//flutter/assets",
"//flutter/common", "//flutter/common",
"//flutter/flow", "//flutter/flow",
...@@ -80,7 +88,6 @@ source_set("runtime") { ...@@ -80,7 +88,6 @@ source_set("runtime") {
"//lib/tonic", "//lib/tonic",
"//third_party/rapidjson", "//third_party/rapidjson",
"//third_party/skia", "//third_party/skia",
":embedded_resources_cc",
] ]
defines = [] defines = []
...@@ -88,27 +95,21 @@ source_set("runtime") { ...@@ -88,27 +95,21 @@ source_set("runtime") {
if (current_toolchain == host_toolchain) { if (current_toolchain == host_toolchain) {
# Though the test font data is small, we dont want to add to the binary size # Though the test font data is small, we dont want to add to the binary size
# on the device. We only add the same on the host test shells. # on the device. We only add the same on the host test shells.
defines += ["EMBED_TEST_FONT_DATA=1"] defines += [ "EMBED_TEST_FONT_DATA=1" ]
} }
if (flutter_runtime_mode != "release") { if (flutter_runtime_mode != "release") {
deps += [ deps += [ "//lib/tonic/debugger" ]
"//lib/tonic/debugger",
]
} }
if (is_android) { if (is_android) {
deps += [ deps += [ "//flutter/lib/jni" ]
"//flutter/lib/jni",
]
} }
# On iOS (device), precompiled snapshots contain the instruction buffer. # On iOS (device), precompiled snapshots contain the instruction buffer.
# Generation of the same requires all application specific script code to be # Generation of the same requires all application specific script code to be
# specified up front. In such cases, there can be no generic snapshot. # specified up front. In such cases, there can be no generic snapshot.
if (!is_ios || use_ios_simulator) { if (!is_ios || use_ios_simulator) {
deps += [ deps += [ "//flutter/lib/snapshot" ]
"//flutter/lib/snapshot",
]
} }
} }
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
group("shell") { group("shell") {
deps = [ "platform" ] deps = [
"platform",
]
} }
...@@ -57,7 +57,7 @@ template("dart_embedder_resources") { ...@@ -57,7 +57,7 @@ template("dart_embedder_resources") {
dart_embedder_resources("generate_embedder_diagnostic_server_resources_cc") { dart_embedder_resources("generate_embedder_diagnostic_server_resources_cc") {
inputs = [ inputs = [
"//flutter/shell/common/diagnostic/diagnostic_server.dart" "//flutter/shell/common/diagnostic/diagnostic_server.dart",
] ]
root_prefix = "//flutter/shell/common/diagnostic/" root_prefix = "//flutter/shell/common/diagnostic/"
output = "$target_gen_dir/embedder_diagnostic_server_resources.cc" output = "$target_gen_dir/embedder_diagnostic_server_resources.cc"
...@@ -100,10 +100,11 @@ source_set("common") { ...@@ -100,10 +100,11 @@ source_set("common") {
] ]
deps = [ deps = [
":generate_embedder_diagnostic_server_resources_cc",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//dart/runtime/vm:libdart_platform",
"//dart/runtime:libdart", "//dart/runtime:libdart",
"//dart/runtime/vm:libdart_platform",
"//flutter/assets", "//flutter/assets",
"//flutter/common", "//flutter/common",
"//flutter/flow", "//flutter/flow",
...@@ -117,6 +118,5 @@ source_set("common") { ...@@ -117,6 +118,5 @@ source_set("common") {
"//third_party/rapidjson", "//third_party/rapidjson",
"//third_party/skia", "//third_party/skia",
"//third_party/skia:gpu", "//third_party/skia:gpu",
":generate_embedder_diagnostic_server_resources_cc",
] ]
} }
...@@ -4,11 +4,17 @@ ...@@ -4,11 +4,17 @@
group("platform") { group("platform") {
if (is_mac || is_ios) { if (is_mac || is_ios) {
deps = [ "darwin" ] deps = [
"darwin",
]
} else if (is_android) { } else if (is_android) {
deps = [ "android" ] deps = [
"android",
]
} else if (is_linux) { } else if (is_linux) {
deps = [ "linux" ] deps = [
"linux",
]
} else { } else {
assert(false, "Unknown/Unsupported platform.") assert(false, "Unknown/Unsupported platform.")
} }
......
...@@ -38,6 +38,7 @@ shared_library("sky_shell") { ...@@ -38,6 +38,7 @@ shared_library("sky_shell") {
] ]
deps = [ deps = [
":jni_headers",
"//base", "//base",
"//dart/runtime:libdart", "//dart/runtime:libdart",
"//flutter/common", "//flutter/common",
...@@ -50,7 +51,6 @@ shared_library("sky_shell") { ...@@ -50,7 +51,6 @@ shared_library("sky_shell") {
"//flutter/vulkan", "//flutter/vulkan",
"//lib/ftl", "//lib/ftl",
"//third_party/skia", "//third_party/skia",
":jni_headers",
] ]
ldflags = [ ldflags = [
...@@ -78,6 +78,7 @@ android_library("java") { ...@@ -78,6 +78,7 @@ android_library("java") {
"io/flutter/view/ResourceExtractor.java", "io/flutter/view/ResourceExtractor.java",
"io/flutter/view/ResourcePaths.java", "io/flutter/view/ResourcePaths.java",
"io/flutter/view/VsyncWaiter.java", "io/flutter/view/VsyncWaiter.java",
# Deprecated classes provided for backwards compatibility # Deprecated classes provided for backwards compatibility
"org/domokit/sky/shell/SkyActivity.java", "org/domokit/sky/shell/SkyActivity.java",
"org/domokit/sky/shell/SkyApplication.java", "org/domokit/sky/shell/SkyApplication.java",
...@@ -113,9 +114,9 @@ android_apk("android") { ...@@ -113,9 +114,9 @@ android_apk("android") {
flutter_dist_jar = "$root_build_dir/flutter.jar" flutter_dist_jar = "$root_build_dir/flutter.jar"
deps = [ deps = [
"//base:base_java",
":assets", ":assets",
":java", ":java",
":sky_shell", ":sky_shell",
"//base:base_java",
] ]
} }
...@@ -10,15 +10,15 @@ source_set("mac_desktop_platform") { ...@@ -10,15 +10,15 @@ source_set("mac_desktop_platform") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [ sources = [
"main_mac.mm",
"platform_view_mac.h",
"platform_view_mac.mm",
"flutter_app_delegate.h", "flutter_app_delegate.h",
"flutter_app_delegate.m", "flutter_app_delegate.m",
"flutter_application.h", "flutter_application.h",
"flutter_application.mm", "flutter_application.mm",
"flutter_window.h", "flutter_window.h",
"flutter_window.mm", "flutter_window.mm",
"main_mac.mm",
"platform_view_mac.h",
"platform_view_mac.mm",
"vsync_waiter_mac.cc", "vsync_waiter_mac.cc",
"vsync_waiter_mac.h", "vsync_waiter_mac.h",
] ]
...@@ -47,9 +47,7 @@ executable("shell_standalone") { ...@@ -47,9 +47,7 @@ executable("shell_standalone") {
resource_copy_mac("mac_desktop_resources") { resource_copy_mac("mac_desktop_resources") {
app_name = "SkyShell" app_name = "SkyShell"
resources = [ resources = [ "//third_party/icu/android/icudtl.dat" ]
"//third_party/icu/android/icudtl.dat",
]
bundle_directory = "." bundle_directory = "."
} }
......
...@@ -23,13 +23,9 @@ shared_library("flutter_framework_dylib") { ...@@ -23,13 +23,9 @@ shared_library("flutter_framework_dylib") {
"framework/Headers/FlutterMacros.h", "framework/Headers/FlutterMacros.h",
"framework/Headers/FlutterMessageListener.h", "framework/Headers/FlutterMessageListener.h",
"framework/Headers/FlutterViewController.h", "framework/Headers/FlutterViewController.h",
"framework/Source/accessibility_bridge.h",
"framework/Source/accessibility_bridge.mm",
"framework/Source/flutter_touch_mapper.h",
"framework/Source/flutter_touch_mapper.mm",
"framework/Source/FlutterAppDelegate.mm", "framework/Source/FlutterAppDelegate.mm",
"framework/Source/FlutterDartProject_Internal.h",
"framework/Source/FlutterDartProject.mm", "framework/Source/FlutterDartProject.mm",
"framework/Source/FlutterDartProject_Internal.h",
"framework/Source/FlutterDartSource.h", "framework/Source/FlutterDartSource.h",
"framework/Source/FlutterDartSource.mm", "framework/Source/FlutterDartSource.mm",
"framework/Source/FlutterJSONMessageListener.mm", "framework/Source/FlutterJSONMessageListener.mm",
...@@ -41,6 +37,10 @@ shared_library("flutter_framework_dylib") { ...@@ -41,6 +37,10 @@ shared_library("flutter_framework_dylib") {
"framework/Source/FlutterView.h", "framework/Source/FlutterView.h",
"framework/Source/FlutterView.mm", "framework/Source/FlutterView.mm",
"framework/Source/FlutterViewController.mm", "framework/Source/FlutterViewController.mm",
"framework/Source/accessibility_bridge.h",
"framework/Source/accessibility_bridge.mm",
"framework/Source/flutter_touch_mapper.h",
"framework/Source/flutter_touch_mapper.mm",
"framework/Source/platform_message_router.h", "framework/Source/platform_message_router.h",
"framework/Source/platform_message_router.mm", "framework/Source/platform_message_router.mm",
"framework/Source/vsync_waiter_ios.h", "framework/Source/vsync_waiter_ios.h",
...@@ -49,7 +49,6 @@ shared_library("flutter_framework_dylib") { ...@@ -49,7 +49,6 @@ shared_library("flutter_framework_dylib") {
"platform_view_ios.mm", "platform_view_ios.mm",
] ]
deps = [ deps = [
"//base:base", "//base:base",
"//dart/runtime:libdart", "//dart/runtime:libdart",
...@@ -65,9 +64,7 @@ shared_library("flutter_framework_dylib") { ...@@ -65,9 +64,7 @@ shared_library("flutter_framework_dylib") {
"//third_party/skia", "//third_party/skia",
] ]
defines = [ defines = [ "FLUTTER_FRAMEWORK" ]
"FLUTTER_FRAMEWORK"
]
libs = [ libs = [
"UIKit.framework", "UIKit.framework",
...@@ -80,8 +77,12 @@ shared_library("flutter_framework_dylib") { ...@@ -80,8 +77,12 @@ shared_library("flutter_framework_dylib") {
copy("framework_dylib") { copy("framework_dylib") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [ "$root_out_dir/libFlutter.dylib" ] sources = [
outputs = [ "$_flutter_framework_dir/Flutter" ] "$root_out_dir/libFlutter.dylib",
]
outputs = [
"$_flutter_framework_dir/Flutter",
]
deps = [ deps = [
":flutter_framework_dylib", ":flutter_framework_dylib",
...@@ -93,8 +94,12 @@ action("framework_install_name") { ...@@ -93,8 +94,12 @@ action("framework_install_name") {
stamp_file = "$root_out_dir/flutter_install_name_stamp" stamp_file = "$root_out_dir/flutter_install_name_stamp"
script = "//flutter/sky/tools/change_install_name.py" script = "//flutter/sky/tools/change_install_name.py"
inputs = [ "$_flutter_framework_dir/Flutter" ] inputs = [
outputs = [ stamp_file ] "$_flutter_framework_dir/Flutter",
]
outputs = [
stamp_file,
]
args = [ args = [
"--dylib", "--dylib",
...@@ -106,20 +111,28 @@ action("framework_install_name") { ...@@ -106,20 +111,28 @@ action("framework_install_name") {
] ]
deps = [ deps = [
":framework_dylib" ":framework_dylib",
] ]
} }
copy("framework_info_plist") { copy("framework_info_plist") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [ "framework/Info.plist" ] sources = [
outputs = [ "$_flutter_framework_dir/Info.plist" ] "framework/Info.plist",
]
outputs = [
"$_flutter_framework_dir/Info.plist",
]
} }
copy("framework_module_map") { copy("framework_module_map") {
visibility = [ ":*" ] visibility = [ ":*" ]
sources = [ "framework/module.modulemap" ] sources = [
outputs = [ "$_flutter_framework_dir/Modules/module.modulemap" ] "framework/module.modulemap",
]
outputs = [
"$_flutter_framework_dir/Modules/module.modulemap",
]
} }
copy("framework_headers") { copy("framework_headers") {
...@@ -134,7 +147,9 @@ copy("framework_headers") { ...@@ -134,7 +147,9 @@ copy("framework_headers") {
"framework/Headers/FlutterMessageListener.h", "framework/Headers/FlutterMessageListener.h",
"framework/Headers/FlutterViewController.h", "framework/Headers/FlutterViewController.h",
] ]
outputs = [ "$_flutter_framework_dir/Headers/{{source_file_part}}" ] outputs = [
"$_flutter_framework_dir/Headers/{{source_file_part}}",
]
} }
copy("framework_icu") { copy("framework_icu") {
...@@ -144,7 +159,9 @@ copy("framework_icu") { ...@@ -144,7 +159,9 @@ copy("framework_icu") {
"//third_party/icu/android/icudtl.dat", "//third_party/icu/android/icudtl.dat",
] ]
set_sources_assignment_filter(sources_assignment_filter) set_sources_assignment_filter(sources_assignment_filter)
outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ] outputs = [
"$_flutter_framework_dir/{{source_file_part}}",
]
} }
group("flutter_framework") { group("flutter_framework") {
......
...@@ -20,14 +20,13 @@ executable("linux") { ...@@ -20,14 +20,13 @@ executable("linux") {
"//flutter/shell/gpu", "//flutter/shell/gpu",
"//flutter/shell/testing", "//flutter/shell/testing",
"//lib/ftl", "//lib/ftl",
"//third_party/glfw",
"//third_party/skia",
# Required by FontCacheLinux. Not Skia. Skia uses a custom font manager # Required by FontCacheLinux. Not Skia. Skia uses a custom font manager
# that delegates to us. # that delegates to us.
"//third_party:fontconfig", "//third_party:fontconfig",
"//third_party/glfw",
"//third_party/skia",
] ]
ldflags = [ ldflags = [ "-lGL" ]
"-lGL",
]
} }
...@@ -9,8 +9,12 @@ if (is_android) { ...@@ -9,8 +9,12 @@ if (is_android) {
source = "//flutter/sky/packages/flutter_services" source = "//flutter/sky/packages/flutter_services"
dest = "$root_build_dir/dist/packages/flutter_services" dest = "$root_build_dir/dist/packages/flutter_services"
inputs = [ source ] inputs = [
outputs = [ dest ] source,
]
outputs = [
dest,
]
args = [ args = [
"--source", "--source",
...@@ -29,8 +33,12 @@ if (is_android) { ...@@ -29,8 +33,12 @@ if (is_android) {
source = "$root_gen_dir/dart-pkg/sky_engine" source = "$root_gen_dir/dart-pkg/sky_engine"
dest = "$root_build_dir/dist/packages/sky_engine" dest = "$root_build_dir/dist/packages/sky_engine"
inputs = [ source ] inputs = [
outputs = [ dest ] source,
]
outputs = [
dest,
]
args = [ args = [
"--source", "--source",
...@@ -51,8 +59,12 @@ if (is_android) { ...@@ -51,8 +59,12 @@ if (is_android) {
source = "$root_gen_dir/dart-pkg/sky_services" source = "$root_gen_dir/dart-pkg/sky_services"
dest = "$root_build_dir/dist/packages/sky_services" dest = "$root_build_dir/dist/packages/sky_services"
inputs = [ source ] inputs = [
outputs = [ dest ] source,
]
outputs = [
dest,
]
args = [ args = [
"--source", "--source",
......
...@@ -19,15 +19,11 @@ config("config") { ...@@ -19,15 +19,11 @@ config("config") {
"$root_out_dir", "$root_out_dir",
] ]
cflags = [ cflags = [ "-Wno-inconsistent-missing-override" ]
"-Wno-inconsistent-missing-override",
]
if (is_fuchsia) { if (is_fuchsia) {
# TODO(abarth): Remove once the kernel support unmapping memory properly. # TODO(abarth): Remove once the kernel support unmapping memory properly.
defines = [ defines = [ "MEMORY_TOOL_REPLACES_ALLOCATOR" ]
"MEMORY_TOOL_REPLACES_ALLOCATOR",
]
} }
} }
...@@ -42,9 +38,7 @@ config("non_test_config") { ...@@ -42,9 +38,7 @@ config("non_test_config") {
} }
group("engine") { group("engine") {
public_configs = [ public_configs = [ ":config" ]
":config",
]
public_deps = [ public_deps = [
"//flutter/sky/engine/core", "//flutter/sky/engine/core",
......
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
import("//flutter/common/config.gni") import("//flutter/common/config.gni")
import("//flutter/sky/engine/core/core.gni") import("//flutter/sky/engine/core/core.gni")
visibility = [ "//flutter/sky/engine/*", "//flutter/sky/shell/*" ] visibility = [
"//flutter/sky/engine/*",
"//flutter/sky/shell/*",
]
static_library("core") { static_library("core") {
output_name = "sky_core" output_name = "sky_core"
...@@ -20,9 +23,7 @@ static_library("core") { ...@@ -20,9 +23,7 @@ static_library("core") {
if (flutter_runtime_mode != "release" && !is_fuchsia) { if (flutter_runtime_mode != "release" && !is_fuchsia) {
# Only include observatory assets in non-release modes. # Only include observatory assets in non-release modes.
deps += [ deps += [ "//dart/runtime/observatory:embedded_observatory_archive" ]
"//dart/runtime/observatory:embedded_observatory_archive",
]
} }
configs += [ configs += [
...@@ -45,20 +46,14 @@ static_library("core") { ...@@ -45,20 +46,14 @@ static_library("core") {
] ]
if (!is_fuchsia) { if (!is_fuchsia) {
public_deps += [ public_deps += [ "//base" ]
"//base",
]
} }
if (flutter_runtime_mode != "release") { if (flutter_runtime_mode != "release") {
public_deps += [ public_deps += [ "//lib/tonic/debugger" ]
"//lib/tonic/debugger",
]
} }
if (is_android) { if (is_android) {
public_deps += [ public_deps += [ "//flutter/lib/jni" ]
"//flutter/lib/jni",
]
} }
} }
...@@ -273,15 +273,11 @@ source_set("platform") { ...@@ -273,15 +273,11 @@ source_set("platform") {
} }
if (is_android) { if (is_android) {
sources += [ sources += [ "fonts/android/FontCacheAndroid.cpp" ]
"fonts/android/FontCacheAndroid.cpp",
]
} }
if (is_linux && !is_android) { if (is_linux && !is_android) {
sources += [ sources += [ "fonts/linux/FontCacheLinux.cpp" ]
"fonts/linux/FontCacheLinux.cpp",
]
} }
if (is_fuchsia) { if (is_fuchsia) {
...@@ -290,9 +286,7 @@ source_set("platform") { ...@@ -290,9 +286,7 @@ source_set("platform") {
"fonts/fuchsia/FontCacheFuchsia.h", "fonts/fuchsia/FontCacheFuchsia.h",
] ]
deps += [ deps += [ "//apps/fonts/services" ]
"//apps/fonts/services",
]
} }
configs += [ configs += [
...@@ -310,9 +304,7 @@ source_set("platform") { ...@@ -310,9 +304,7 @@ source_set("platform") {
if (is_android) { if (is_android) {
# Add in some Linux files also shared with Android. # Add in some Linux files also shared with Android.
set_sources_assignment_filter([]) set_sources_assignment_filter([])
sources += [ sources += [ "fonts/linux/FontPlatformDataLinux.cpp" ]
"fonts/linux/FontPlatformDataLinux.cpp",
]
set_sources_assignment_filter(sources_assignment_filter) set_sources_assignment_filter(sources_assignment_filter)
} }
} }
...@@ -19,8 +19,6 @@ source_set("web") { ...@@ -19,8 +19,6 @@ source_set("web") {
] ]
if (is_fuchsia) { if (is_fuchsia) {
deps += [ deps += [ "//lib/mtl/tasks" ]
"//lib/mtl/tasks",
]
} }
} }
...@@ -227,6 +227,7 @@ executable("wtf_unittests") { ...@@ -227,6 +227,7 @@ executable("wtf_unittests") {
"StringExtrasTest.cpp", "StringExtrasTest.cpp",
"StringHasherTest.cpp", "StringHasherTest.cpp",
"TemporaryChangeTest.cpp", "TemporaryChangeTest.cpp",
"VectorTest.cpp",
"testing/RunAllTests.cpp", "testing/RunAllTests.cpp",
"testing/WTFTestHelpers.cpp", "testing/WTFTestHelpers.cpp",
"testing/WTFTestHelpers.h", "testing/WTFTestHelpers.h",
...@@ -238,7 +239,6 @@ executable("wtf_unittests") { ...@@ -238,7 +239,6 @@ executable("wtf_unittests") {
"text/StringImplTest.cpp", "text/StringImplTest.cpp",
"text/StringOperatorsTest.cpp", "text/StringOperatorsTest.cpp",
"text/TextCodecUTF8Test.cpp", "text/TextCodecUTF8Test.cpp",
"VectorTest.cpp",
# The following tests depend on either ICU or the locale. Disable them for # The following tests depend on either ICU or the locale. Disable them for
# now. # now.
...@@ -253,6 +253,7 @@ executable("wtf_unittests") { ...@@ -253,6 +253,7 @@ executable("wtf_unittests") {
deps = [ deps = [
":wtf", ":wtf",
# Does not use //flutter/testing because it needs and provides its own main # Does not use //flutter/testing because it needs and provides its own main
# function in RunAllTests.cpp. # function in RunAllTests.cpp.
"//third_party/gtest", "//third_party/gtest",
......
...@@ -6,8 +6,8 @@ group("packages") { ...@@ -6,8 +6,8 @@ group("packages") {
testonly = true testonly = true
deps = [ deps = [
"//flutter/sky/packages/flutter_services",
"//flutter/sky/packages/sky_engine", "//flutter/sky/packages/sky_engine",
"//flutter/sky/packages/sky_services", "//flutter/sky/packages/sky_services",
"//flutter/sky/packages/flutter_services",
] ]
} }
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
group("flutter_services") { group("flutter_services") {
deps = [ "//flutter/sky/packages/sky_services" ] deps = [
"//flutter/sky/packages/sky_services",
]
} }
...@@ -103,11 +103,11 @@ group("copy_dart_sdk") { ...@@ -103,11 +103,11 @@ group("copy_dart_sdk") {
dart_pkg("sky_engine") { dart_pkg("sky_engine") {
sources = [ sources = [
"LICENSE",
"README.md",
"dart_sdk/_empty.dart", "dart_sdk/_empty.dart",
"lib/_embedder.yaml", "lib/_embedder.yaml",
"README.md",
"pubspec.yaml", "pubspec.yaml",
"LICENSE"
] ]
deps = [ deps = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册