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: 3 additions & 9 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) ]
}
}
Expand Down Expand Up @@ -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" ]
}
}
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -485,7 +485,7 @@ deps = {
'packages': [
{
'package': 'gn/gn/${{platform}}',
'version': 'git_revision:152c5144ceed9592c20f0c8fd55769646077569b'
'version': 'git_revision:1e3fd10c5df6b704fc764ee388149e4f32862823'
},
],
'dep_type': 'cipd',
Expand Down
12 changes: 3 additions & 9 deletions build/dart/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
4 changes: 1 addition & 3 deletions build/zip_bundle.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: ace4b50b35dcf1f0615ef82b87950698
Signature: 97a28766592ed592458b78e7da5d05fd

UNUSED LICENSES:

Expand Down
4 changes: 1 addition & 3 deletions common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ source_set("common") {
"task_runners.h",
]

deps = [
"//flutter/fml",
]
deps = [ "//flutter/fml" ]

public_configs = [
":flutter_config",
Expand Down
12 changes: 3 additions & 9 deletions flow/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 3 deletions flutter_frontend_server/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 1 addition & 3 deletions fml/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
48 changes: 12 additions & 36 deletions lib/snapshot/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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"
Expand Down Expand Up @@ -109,9 +103,7 @@ template("bin_to_assembly") {
script,
invoker.input,
]
outputs = [
output,
]
outputs = [ output ]
}
}

Expand Down Expand Up @@ -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 ]
}
}

Expand All @@ -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"
Expand Down Expand Up @@ -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 changes: 5 additions & 15 deletions lib/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -163,9 +161,7 @@ if (enable_unittests) {

public_configs = [ "//flutter:export_dynamic_symbols" ]

sources = [
"ui_benchmarks.cc",
]
sources = [ "ui_benchmarks.cc" ]

deps = [
":ui",
Expand Down Expand Up @@ -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 changes: 5 additions & 15 deletions runtime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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" ]

Expand Down Expand Up @@ -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 changes: 1 addition & 3 deletions shell/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
# found in the LICENSE file.

group("shell") {
deps = [
"platform",
]
deps = [ "platform" ]
}
Loading