Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions build/darwin/ios_app.gni
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@ template("ios_app") {
assert(is_ios)

copy("${target_name}__info_plist") {
sources = [ invoker.info_plist ]
outputs = [ "$root_out_dir/${target_name}.app/Info.plist" ]
sources = [
invoker.info_plist,
]
outputs = [
"$root_out_dir/${target_name}.app/Info.plist",
]
}
executable("$target_name") {
forward_variables_from(invoker, "*")
output_name = "${target_name}.app/$target_name"

deps += [
":${target_name}__info_plist",
]
deps += [ ":${target_name}__info_plist" ]
}
}
9 changes: 7 additions & 2 deletions build/zip_bundle.gni
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ 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

args = [ "-o", rebase_path(outputs[0]) ]
args = [
"-o",
rebase_path(outputs[0]),
]
foreach(input, invoker.files) {
args += [
"-i",
Expand Down
1 change: 0 additions & 1 deletion flutter_frontend_server/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ if (is_fuchsia_host || is_fuchsia) {
deps = [
":flutter_frontend_server",
]

}
} else {
import("//third_party/dart/utils/application_snapshot.gni")
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,10 @@ action("robolectric_tests") {
"test/io/flutter/embedding/android/FlutterAndroidComponentTest.java",
"test/io/flutter/embedding/android/FlutterFragmentTest.java",
"test/io/flutter/embedding/android/FlutterViewTest.java",
"test/io/flutter/embedding/engine/dart/DartExecutorTest.java",
"test/io/flutter/embedding/engine/FlutterEngineCacheTest.java",
"test/io/flutter/embedding/engine/FlutterJNITest.java",
"test/io/flutter/embedding/engine/RenderingComponentTest.java",
"test/io/flutter/embedding/engine/dart/DartExecutorTest.java",
"test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java",
"test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java",
"test/io/flutter/plugin/common/StandardMessageCodecTest.java",
Expand Down
4 changes: 1 addition & 3 deletions shell/platform/darwin/ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,7 @@ ios_app("FlutterTests") {
"flutter_unittests.mm",
]

libs = [
"Foundation.framework",
]
libs = [ "Foundation.framework" ]

deps = [
":flutter_tests_fixtures",
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ if (current_toolchain == host_toolchain) {
"$flutter_root/testing:dart",
"$flutter_root/testing:opengl",
"$flutter_root/testing:skia",
"//third_party/dart/runtime/bin:elf_loader",
"//third_party/skia",
"//third_party/tonic",
"//third_party/dart/runtime/bin:elf_loader",
]
}
}
Expand Down
3 changes: 2 additions & 1 deletion shell/platform/fuchsia/dart_runner/embedder/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ template("create_aot_snapshot") {
# No asserts in debug or release product.
# No asserts in release with flutter_profile=true (non-product)
# Yes asserts in non-product debug.
if (!invoker.product && (!(flutter_runtime_mode == "profile") || is_debug)) {
if (!invoker.product &&
(!(flutter_runtime_mode == "profile") || is_debug)) {
args += [ "--enable_asserts" ]
}
args += [ rebase_path(shim_kernel) ]
Expand Down
3 changes: 2 additions & 1 deletion sky/packages/sky_engine/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

import("//build/fuchsia/sdk.gni")
import("//third_party/dart/sdk/lib/_http/http_sources.gni")
import("//third_party/dart/sdk/lib/_internal/js_runtime/interceptors_sources.gni")
import(
"//third_party/dart/sdk/lib/_internal/js_runtime/interceptors_sources.gni")
import("//third_party/dart/sdk/lib/async/async_sources.gni")
import("//third_party/dart/sdk/lib/collection/collection_sources.gni")
import("//third_party/dart/sdk/lib/convert/convert_sources.gni")
Expand Down
4 changes: 3 additions & 1 deletion testing/testing.gni
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ template("dart_snapshot_aot") {
# 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 = [
"--causal_async_stacks",
Expand Down
4 changes: 2 additions & 2 deletions web_sdk/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ copy("web_ui_library") {
# Compile the DDC SDK's summary.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
deps = [
"//third_party/dart:create_sdk",
"//third_party/dart:create_sdk",
"//third_party/dart/pkg:pkg_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
Expand Down Expand Up @@ -140,7 +140,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
# Compiles the DDC SDK's JS code.
prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
deps = [
"//third_party/dart:create_sdk",
"//third_party/dart:create_sdk",
"//third_party/dart/pkg:pkg_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_files_stamp",
"//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",
Expand Down