From 3b0a191fc58838b1d69a8191e75056419341364d Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 28 Feb 2024 14:45:26 -0800 Subject: [PATCH 01/40] remove --- build/config/fuchsia/gn_configs.gni | 78 ++++++++++++++++------------- tools/fuchsia/fuchsia_archive.gni | 1 - 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index f6d1d493db936..8bef9294955d6 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -2,49 +2,42 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# TODO(richkadel): added this import and modified the fuchsia_sdk assignment. -# See below. -import("//build/fuchsia/sdk.gni") -declare_args() { - # Path to the fuchsia SDK. This is intended for use in other templates & rules - # to reference the contents of the fuchsia SDK. - fuchsia_sdk = "$fuchsia_sdk_path" +# This file is copied from +# https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni +# with some local modifications to match the flutter setup. + +assert(is_fuchsia) - # TODO(richkadel): Since flutter needs build rules from the GN SDK, but also - # requires the Fuchsia _Core_ SDK (for dart libraries, in the core SDK, but - # excluded from the GN SDK), the Fuchsia SDK assumption that the build files - # are in the same SDK directory path as the APIs does not hold true. (And - # there are a couple of other minor tweaks that appear to be needed, at - # this time.) This use case will be discussed with the SDK team, to see if we - # can come up with a cleaner solution. +declare_args() { + # Path to the fuchsia SDK. This is intended for use in other templates & + # rules to reference the contents of the fuchsia SDK. + fuchsia_sdk = "//fuchsia/sdk/$host_os" - # Build ID uniquely identifying the Fuchsia IDK. This is exposed as a property so - # it can be used to locate images and packages on GCS and as a marker to indicate the - # "version" of the IDK. If it is empty, then it is most likely that something is fatally wrong. + # ID uniquely identifying the Fuchsia IDK build. This is exposed as a + # property so it can be used to locate images and packages on GCS and + # as a marker to indicate the "version" of the IDK. + # Defaults to the id found in the manifest.json file of the SDK. fuchsia_sdk_id = "" } -declare_args() { - # The SDK manifest file. This is useful to include as a dependency - # for some targets in order to cause a rebuild when the version of the - # SDK is changed. - fuchsia_sdk_manifest_file = "$fuchsia_sdk/meta/manifest.json" +# TODO(zijiehe): Remove the override and move it into declare_args once the one +# in //build/config/sdk.gni being removed. - b/40935282 - # fuchsia_tool_dir is use to specify the directory in the SDK to locate tools for the - # host cpu architecture. If the host_cpu is not recognized, then tool dir - # defaults to x64. - fuchsia_tool_dir = "$fuchsia_sdk/tools/x64" - if (host_cpu == "x64" || host_cpu == "arm64") { - fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}" - } +# The target API level for this repository. Embedders should override this +# value to specify the API level the packages produced from this repository +# should be targeting, e.g. in their top-level //.gn file. A value of -1 +# means that no API level will be passed to the tools that consumes it. +fuchsia_target_api_level = 16 - # fuchsia_auto_index_symbols when true adds the ids.txt file generated from a `fuchsia_package` - # to the Fuchsia symbol index used to symbolize logs and to find source when using zxdb. - # The default value is false, in order to be backwards compatibility with existing builds, and - # only makes sense to set to true when building as a developer that will need to symbolize logs - # or use the debugger with locally build code. - fuchsia_auto_index_symbols = false -} +# The SDK manifest file. This is useful to include as a dependency +# for some targets in order to cause a rebuild when the version of the +# SDK is changed. +fuchsia_sdk_manifest_file = "${fuchsia_sdk}/meta/manifest.json" + +# fuchsia_tool_dir is used to specify the directory in the SDK to locate +# tools for the host cpu architecture. If the host_cpu is not recognized, +# then tool dir defaults to x64. +fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}" if (fuchsia_sdk_id == "") { # Note: If we need to expose more than just the id in the future, @@ -64,3 +57,16 @@ declare_args() { fuchsia_sdk_readelf_exec = "" } } + +# Copy from third_party/fuchsia-gn-sdk/src/gn_configs.gni to avoid importing +# files from //third_party/ in //build/. +if (current_cpu != "") { + # According to + # https://gn.googlesource.com/gn/+/main/docs/cross_compiles.md#as-a-build_gn-author, + # current_cpu is preferred. + fuchsia_arch_root = current_cpu +} else { + fuchsia_arch_root = target_cpu +} +fuchsia_arch_root = + "${fuchsia_sdk}/obj/${fuchsia_arch_root}-api-${fuchsia_target_api_level}" diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni index 41e51e09f1f60..9161dd0ccf2a2 100644 --- a/tools/fuchsia/fuchsia_archive.gni +++ b/tools/fuchsia/fuchsia_archive.gni @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/config.gni") import("//flutter/tools/fuchsia/fuchsia_debug_symbols.gni") import("//flutter/tools/fuchsia/fuchsia_libs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/cmc.gni") From 68c57b391591c43eebfeaccb83b534c787a7d11f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 6 Mar 2024 15:30:12 -0800 Subject: [PATCH 02/40] env --- tools/fuchsia/with_envs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index 8f66f3b7437ef..c4336a51b3833 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,6 +29,7 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/gn-sdk/src') with subprocess.Popen(sys.argv[1:]) as proc: try: From 2af6427f2e79a60791baeb785ebf8e276e95575d Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 6 Mar 2024 16:16:46 -0800 Subject: [PATCH 03/40] fuchsia_gn_sdk --- tools/gn | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gn b/tools/gn index 375af5d707939..bb8756e277d33 100755 --- a/tools/gn +++ b/tools/gn @@ -754,6 +754,7 @@ def to_gn_args(args): if args.target_os == 'fuchsia': gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni' + gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk' if args.fuchsia_target_api_level is not None: gn_args['fuchsia_target_api_level'] = args.fuchsia_target_api_level elif args.target_os == 'fuchsia': From 5fac7cad79aa25973485c2ed457138441cbfea84 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 11:51:46 -0800 Subject: [PATCH 04/40] deps --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6c531f2762952..c8fe6107a22cc 100644 --- a/DEPS +++ b/DEPS @@ -261,7 +261,7 @@ vars = { # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be # used altogether with fuchsia-sdk to generate gn based build rules. - 'fuchsia_gn_sdk_version': 'l8zShEOXGGjtLYRulEX5CjT2RemKvUPOT6L-uXy41tMC', + 'fuchsia_gn_sdk_version': 'RgErspyYHapUO2SpcW-vo2p8yaRUMUrq0eWjRVPfQjoC', } gclient_gn_args_file = 'src/third_party/dart/build/config/gclient_args.gni' From ce46f682d7f613170dcb539375465dc23adcc37f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:24:15 -0800 Subject: [PATCH 05/40] deps --- DEPS | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index ffe3ad212ce51..dd8903d6625e0 100644 --- a/DEPS +++ b/DEPS @@ -1024,7 +1024,6 @@ deps = { 'version': Var('fuchsia_test_scripts_version'), } ], - 'condition': 'run_fuchsia_emu', 'dep_type': 'cipd', }, @@ -1236,5 +1235,23 @@ hooks = [ '--as-gclient-hook', Var('mac_sdk_min') ] - } + }, + { + 'name': 'Erase arch/ from fuchsia sdk', + 'pattern': '.', + 'action': [ + 'rm', + '-rf', + 'src/fuchsia/sdk/linux/arch', + ], + }, + { + 'name': 'Generate Fuchsia GN build rules', + 'pattern': '.', + 'action': [ + 'python3', + 'src/flutter/tools/fuchsia/with_envs.py', + 'src/flutter/tools/fuchsia/test_scripts/gen_build_defs.py', + ], + }, ] From c815089821dc6284542ce70be21244f7b3f78f07 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:33:14 -0800 Subject: [PATCH 06/40] import --- build/secondary/flutter/third_party/googletest/BUILD.gn | 2 +- display_list/BUILD.gn | 2 +- flow/BUILD.gn | 2 +- fml/BUILD.gn | 2 +- lib/snapshot/BUILD.gn | 2 +- lib/ui/BUILD.gn | 2 +- shell/common/BUILD.gn | 2 +- shell/platform/BUILD.gn | 2 +- shell/platform/fuchsia/BUILD.gn | 2 +- shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn | 2 +- shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn | 2 +- shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/fidl/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/kernel/BUILD.gn | 2 +- .../fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn | 2 +- .../tests/startup_integration_test/dart_aot_runner/BUILD.gn | 2 +- .../tests/startup_integration_test/dart_echo_server/BUILD.gn | 2 +- .../tests/startup_integration_test/dart_jit_runner/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/kernel/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/tests/integration/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/embedder/BUILD.gn | 2 +- .../flutter/tests/integration/embedder/child-view/BUILD.gn | 2 +- .../flutter/tests/integration/embedder/parent-view/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/mouse-input/BUILD.gn | 2 +- .../tests/integration/mouse-input/mouse-input-view/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/text-input/BUILD.gn | 2 +- .../tests/integration/text-input/text-input-view/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/touch-input/BUILD.gn | 2 +- .../integration/touch-input/embedding-flutter-view/BUILD.gn | 2 +- .../tests/integration/touch-input/touch-input-view/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn | 2 +- shell/platform/fuchsia/runtime/dart/utils/BUILD.gn | 2 +- shell/testing/BUILD.gn | 2 +- skia/BUILD.gn | 2 +- sky/packages/sky_engine/BUILD.gn | 2 +- third_party/libjpeg-turbo/BUILD.gn | 2 +- third_party/txt/BUILD.gn | 2 +- tools/fuchsia/fidl/BUILD.gn | 2 +- tools/fuchsia/fidl/fidl.gni | 2 +- tools/fuchsia/sdk/sdk_targets.gni | 2 +- vulkan/BUILD.gn | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build/secondary/flutter/third_party/googletest/BUILD.gn b/build/secondary/flutter/third_party/googletest/BUILD.gn index a19578d7bedc5..90de2cc6cc3e8 100644 --- a/build/secondary/flutter/third_party/googletest/BUILD.gn +++ b/build/secondary/flutter/third_party/googletest/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. if (is_fuchsia) { - import("//build/fuchsia/sdk.gni") + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") } config("gtest_private_config") { diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn index eb547dd7d7646..18b711541cbf1 100644 --- a/display_list/BUILD.gn +++ b/display_list/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/testing/testing.gni") diff --git a/flow/BUILD.gn b/flow/BUILD.gn index bcbb6541beaa1..82561a1f53392 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 2ca165612b0dd..8a5ce780928a6 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 9b8f9ac3ce22a..8fe1a2a7ffd38 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/build/bin_to_obj.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 353de535af150..41e6d0a2b386f 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index c570e660f367b..bc65c18b94b69 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") diff --git a/shell/platform/BUILD.gn b/shell/platform/BUILD.gn index 66baf0e887fe1..7617844042fc4 100644 --- a/shell/platform/BUILD.gn +++ b/shell/platform/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/shell/platform/config.gni") group("platform") { diff --git a/shell/platform/fuchsia/BUILD.gn b/shell/platform/fuchsia/BUILD.gn index b231c31d20998..a2d7ae06a7f0a 100644 --- a/shell/platform/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart.gni") diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index 1ee3396a7c6bb..b7e716cbe918b 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") config("sdk_ext_config") { include_dirs = [ "../.." ] diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn index a354ae5c5da59..b14cf208de644 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn index 5c5e179182a7d..c9282ec63353f 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") config("zircon_ffi_config") { include_dirs = [ "." ] diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index e7596e83317bf..259a912e778da 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/fuchsia_config.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart.gni") diff --git a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn index ba9f6be2c7f00..dc12f2c82c4a6 100644 --- a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") fidl("dart_test") { diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn index 5dcbc1e9dfacc..ac3735207cc3a 100644 --- a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") import("$dart_src/utils/compile_platform.gni") diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn index efb1d7ac29647..4580775e917c7 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("startup_integration_test") { testonly = true diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn index 875b516596801..90bc10ed98c31 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_component.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn index 100b1d04ff724..9e0bc82260fa2 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_component.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn index f14b70096f673..e2b0bfaa52557 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_component.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") diff --git a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn index 12810557c3c8b..955f6b5f5608a 100644 --- a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") import("//flutter/tools/fuchsia/dart_kernel.gni") diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 45d5e1242cff1..1a0be8aa5085a 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/shell/config.gni") import("//flutter/shell/gpu/gpu.gni") diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn index b6b254581ffb1..ac0c05e5d8fd2 100644 --- a/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") import("$dart_src/utils/compile_platform.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn index 30ba3b7690f42..2117b86aa4e62 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("integration") { testonly = true diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 4c16bb93e7b2c..f53b532052b3e 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") group("tests") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn index 22534d2566a09..1ad07c2d8eebd 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn index 1e0def98cbd1f..e20c11c89887f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index 8268934a7e36b..6dec680c17969 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn index 0126dc2353607..da81f3be7f8d1 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index f59583cff488d..c52220401e1c8 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn index 38d8760bdbd9a..ddd30fe1776dd 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index bb171df81f8af..ba94060fb6923 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn index 6e86329531f9a..a1f13b7b83d09 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn index 9ef6301ece171..69dfa7e917251 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn index e7b6dc40187ad..d46f1a8b76359 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") source_set("check_view") { sources = [ diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 0892d2e888f73..6508bdaa97132 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -4,7 +4,7 @@ assert(is_fuchsia) -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn index 31ff57aa492c6..1cb9e46dc3cf3 100644 --- a/shell/testing/BUILD.gn +++ b/shell/testing/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 0fa800feefd95..980830eca7c4d 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -10,7 +10,7 @@ import("$_skia_root/gn/toolchain/wasm.gni") import("flutter_defines.gni") if (is_fuchsia) { - import("//build/fuchsia/sdk.gni") + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") } # Skia public API, generally provided by :skia. diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index f03ddb53ea5dd..a19e1c407bacc 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/build/dart/rules.gni") import("//flutter/lib/ui/dart_ui.gni") import("//flutter/web_sdk/web_sdk.gni") diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index fa1802263b9cf..ad5ba02258ef1 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -8,7 +8,7 @@ if (current_cpu == "arm") { import("//build/config/arm.gni") } -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") if ((current_cpu == "x86" || current_cpu == "x64") && is_fuchsia && !using_fuchsia_sdk) { diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 804865e0881b5..9588f00f92948 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") diff --git a/tools/fuchsia/fidl/BUILD.gn b/tools/fuchsia/fidl/BUILD.gn index 0855b3f0bc907..102b819b1b32a 100644 --- a/tools/fuchsia/fidl/BUILD.gn +++ b/tools/fuchsia/fidl/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") import("//flutter/tools/fuchsia/fidl/toolchain.gni") import("//flutter/tools/fuchsia/sdk/sdk_targets.gni") diff --git a/tools/fuchsia/fidl/fidl.gni b/tools/fuchsia/fidl/fidl.gni index c38db0a9571e4..32fff1c044dce 100644 --- a/tools/fuchsia/fidl/fidl.gni +++ b/tools/fuchsia/fidl/fidl.gni @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/toolchain.gni") # Declares a FIDL library. diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni index 159ce98c2ce36..bc3470f6b498d 100644 --- a/tools/fuchsia/sdk/sdk_targets.gni +++ b/tools/fuchsia/sdk/sdk_targets.gni @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn index 0dbb8946756d6..4b41ced9137ec 100644 --- a/vulkan/BUILD.gn +++ b/vulkan/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/fuchsia/sdk.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") source_set("vulkan") { sources = [ From 8e8832c797a23175d0fc6c9c4bdf93127e28c4aa Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:36:01 -0800 Subject: [PATCH 07/40] fuchsia_sdk_root -> fuchsia_sdk --- build/config/fuchsia/gn_configs.gni | 2 + .../flutter/third_party/googletest/BUILD.gn | 4 +- fml/BUILD.gn | 24 +++---- shell/common/BUILD.gn | 8 +-- .../fuchsia/dart-pkg/fuchsia/BUILD.gn | 4 +- .../platform/fuchsia/dart-pkg/zircon/BUILD.gn | 12 ++-- .../fuchsia/dart-pkg/zircon_ffi/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 40 +++++------ .../dart_aot_runner/BUILD.gn | 14 ++-- .../dart_jit_runner/BUILD.gn | 14 ++-- shell/platform/fuchsia/flutter/BUILD.gn | 66 +++++++++---------- .../tests/integration/embedder/BUILD.gn | 28 ++++---- .../tests/integration/mouse-input/BUILD.gn | 44 ++++++------- .../tests/integration/text-input/BUILD.gn | 32 ++++----- .../tests/integration/touch-input/BUILD.gn | 44 ++++++------- .../flutter/tests/integration/utils/BUILD.gn | 30 ++++----- .../fuchsia/runtime/dart/utils/BUILD.gn | 26 ++++---- skia/BUILD.gn | 2 +- third_party/txt/BUILD.gn | 2 +- 19 files changed, 200 insertions(+), 198 deletions(-) diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 8bef9294955d6..5f84ae095f246 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -70,3 +70,5 @@ if (current_cpu != "") { } fuchsia_arch_root = "${fuchsia_sdk}/obj/${fuchsia_arch_root}-api-${fuchsia_target_api_level}" + +use_fuchsia_sdk = true diff --git a/build/secondary/flutter/third_party/googletest/BUILD.gn b/build/secondary/flutter/third_party/googletest/BUILD.gn index 90de2cc6cc3e8..27770d98f37ed 100644 --- a/build/secondary/flutter/third_party/googletest/BUILD.gn +++ b/build/secondary/flutter/third_party/googletest/BUILD.gn @@ -34,8 +34,8 @@ static_library("gtest") { if (is_fuchsia) { if (using_fuchsia_sdk) { deps = [ - "$fuchsia_sdk_root/pkg:fdio", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/pkg:fdio", + "$fuchsia_sdk/pkg:zx", ] } else { deps = [ diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 8a5ce780928a6..6c0adc4682a63 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -227,16 +227,16 @@ source_set("fml") { ] public_deps += [ - "$fuchsia_sdk_root/fidl:fuchsia.diagnostics", - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/pkg:async-cpp", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:async-loop-default", - "$fuchsia_sdk_root/pkg:component_incoming_cpp", - "$fuchsia_sdk_root/pkg:syslog_structured_backend", - "$fuchsia_sdk_root/pkg:trace", - "$fuchsia_sdk_root/pkg:trace-engine", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.diagnostics", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/pkg:async-cpp", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:async-loop-default", + "$fuchsia_sdk/pkg:component_incoming_cpp", + "$fuchsia_sdk/pkg:syslog_structured_backend", + "$fuchsia_sdk/pkg:trace", + "$fuchsia_sdk/pkg:trace-engine", + "$fuchsia_sdk/pkg:zx", ] } @@ -407,8 +407,8 @@ if (enable_unittests) { if (is_fuchsia) { deps += [ - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", ] # This is needed for //flutter/third_party/googletest for linking zircon diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index bc65c18b94b69..dfdc393c99790 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -340,10 +340,10 @@ if (enable_unittests) { sources += [ "shell_fuchsia_unittests.cc" ] deps += [ - "$fuchsia_sdk_root/fidl:fuchsia.intl", - "$fuchsia_sdk_root/fidl:fuchsia.settings", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_cpp", + "$fuchsia_sdk/fidl:fuchsia.intl", + "$fuchsia_sdk/fidl:fuchsia.settings", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_cpp", ] } else if (shell_enable_gl) { # TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index b7e716cbe918b..5981eeb189a72 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn @@ -19,13 +19,13 @@ source_set("sdk_ext") { ] deps = [ - "$fuchsia_sdk_root/pkg:async-cpp", + "$fuchsia_sdk/pkg:async-cpp", "../zircon", "//flutter/fml", "//flutter/third_party/tonic", ] - public_deps = [ "$fuchsia_sdk_root/pkg:zx" ] + public_deps = [ "$fuchsia_sdk/pkg:zx" ] public_configs = [ ":sdk_ext_config" ] } diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn index b14cf208de644..8ba7f6dca8775 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn @@ -29,12 +29,12 @@ source_set("zircon") { ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.io", - "$fuchsia_sdk_root/pkg:async-cpp", - "$fuchsia_sdk_root/pkg:async-default", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:fdio", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.io", + "$fuchsia_sdk/pkg:async-cpp", + "$fuchsia_sdk/pkg:async-default", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:fdio", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", "//flutter/third_party/tonic", ] diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn index c9282ec63353f..1033e4a2b6eff 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn @@ -27,7 +27,7 @@ shared_library("zircon_ffi") { deps = [ "$dart_src/runtime:dart_api", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", ] } diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 259a912e778da..516665830df41 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -43,28 +43,28 @@ template("runner_sources") { } public_deps = [ - "$fuchsia_sdk_root/pkg:sys_cpp", + "$fuchsia_sdk/pkg:sys_cpp", "//flutter/fml", ] + dart_public_deps deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.component.runner", - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/fidl:fuchsia.test", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-cpp", - "$fuchsia_sdk_root/pkg:async-default", - "$fuchsia_sdk_root/pkg:async-loop", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:async-loop-default", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:inspect", - "$fuchsia_sdk_root/pkg:inspect_component_cpp", - "$fuchsia_sdk_root/pkg:sys_cpp", - "$fuchsia_sdk_root/pkg:sys_cpp_testing", - "$fuchsia_sdk_root/pkg:trace", - "$fuchsia_sdk_root/pkg:vfs_cpp", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.component.runner", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/fidl:fuchsia.test", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-cpp", + "$fuchsia_sdk/pkg:async-default", + "$fuchsia_sdk/pkg:async-loop", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:async-loop-default", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:inspect", + "$fuchsia_sdk/pkg:inspect_component_cpp", + "$fuchsia_sdk/pkg:sys_cpp", + "$fuchsia_sdk/pkg:sys_cpp_testing", + "$fuchsia_sdk/pkg:trace", + "$fuchsia_sdk/pkg:vfs_cpp", + "$fuchsia_sdk/pkg:zx", "fidl:dart_test", "//flutter/common", "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia", @@ -100,8 +100,8 @@ template("runner") { deps = [ ":" + target_name + "_runner_sources", - "$fuchsia_sdk_root/pkg:inspect_component_cpp", - "$fuchsia_sdk_root/pkg:trace-provider-so", + "$fuchsia_sdk/pkg:inspect_component_cpp", + "$fuchsia_sdk/pkg:trace-provider-so", ] + extra_deps } } diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn index 90bc10ed98c31..91ff79d2b4ac5 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn @@ -25,13 +25,13 @@ executable("dart-aot-runner-integration-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "../dart_echo_server:aot_echo_package", "//flutter/fml", "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test", diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn index e2b0bfaa52557..0a92606943137 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn @@ -25,13 +25,13 @@ executable("dart-jit-runner-integration-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "../dart_echo_server:jit_echo_package", "//flutter/fml", "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test", diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 1a0be8aa5085a..03a605e92b625 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -139,40 +139,40 @@ template("runner_sources") { ] public_deps = [ - "$fuchsia_sdk_root/pkg:inspect", - "$fuchsia_sdk_root/pkg:inspect_component_cpp", - "$fuchsia_sdk_root/pkg:sys_cpp", + "$fuchsia_sdk/pkg:inspect", + "$fuchsia_sdk/pkg:inspect_component_cpp", + "$fuchsia_sdk/pkg:sys_cpp", "//flutter/shell/platform/fuchsia/runtime/dart/utils", ] + flutter_public_deps deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk_root/fidl:fuchsia.component.runner", - "$fuchsia_sdk_root/fidl:fuchsia.fonts", - "$fuchsia_sdk_root/fidl:fuchsia.images", - "$fuchsia_sdk_root/fidl:fuchsia.intl", - "$fuchsia_sdk_root/fidl:fuchsia.io", - "$fuchsia_sdk_root/fidl:fuchsia.media", - "$fuchsia_sdk_root/fidl:fuchsia.memorypressure", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.composition", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input3", - "$fuchsia_sdk_root/fidl:fuchsia.ui.pointer", - "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.views", - "$fuchsia_sdk_root/pkg:async-cpp", - "$fuchsia_sdk_root/pkg:async-default", - "$fuchsia_sdk_root/pkg:async-loop", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:fdio", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:trace", - "$fuchsia_sdk_root/pkg:trace-engine", - "$fuchsia_sdk_root/pkg:trace-provider-so", - "$fuchsia_sdk_root/pkg:vfs_cpp", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", + "$fuchsia_sdk/fidl:fuchsia.component.runner", + "$fuchsia_sdk/fidl:fuchsia.fonts", + "$fuchsia_sdk/fidl:fuchsia.images", + "$fuchsia_sdk/fidl:fuchsia.intl", + "$fuchsia_sdk/fidl:fuchsia.io", + "$fuchsia_sdk/fidl:fuchsia.media", + "$fuchsia_sdk/fidl:fuchsia.memorypressure", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.composition", + "$fuchsia_sdk/fidl:fuchsia.ui.input", + "$fuchsia_sdk/fidl:fuchsia.ui.input3", + "$fuchsia_sdk/fidl:fuchsia.ui.pointer", + "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.views", + "$fuchsia_sdk/pkg:async-cpp", + "$fuchsia_sdk/pkg:async-default", + "$fuchsia_sdk/pkg:async-loop", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:fdio", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:trace", + "$fuchsia_sdk/pkg:trace-engine", + "$fuchsia_sdk/pkg:trace-provider-so", + "$fuchsia_sdk/pkg:vfs_cpp", + "$fuchsia_sdk/pkg:zx", "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia", "//flutter/shell/platform/fuchsia/dart-pkg/zircon", ] + flutter_deps @@ -226,9 +226,9 @@ template("flutter_runner") { deps = [ ":flutter_runner_sources${product_suffix}", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:trace", - "$fuchsia_sdk_root/pkg:trace-provider-so", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:trace", + "$fuchsia_sdk/pkg:trace-provider-so", ] + extra_deps # The flags below are needed so that Dart's CPU profiler can walk the diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index f53b532052b3e..3b532f9cead2b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -24,20 +24,20 @@ executable("flutter-embedder-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.inspect", - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.composition", - "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.inspect", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.composition", + "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", + "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:screenshot", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index 6dec680c17969..f412154478fd7 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -23,28 +23,28 @@ executable("mouse-input-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk_root/fidl:fuchsia.buildinfo", - "$fuchsia_sdk_root/fidl:fuchsia.component", - "$fuchsia_sdk_root/fidl:fuchsia.fonts", - "$fuchsia_sdk_root/fidl:fuchsia.intl", - "$fuchsia_sdk_root/fidl:fuchsia.kernel", - "$fuchsia_sdk_root/fidl:fuchsia.memorypressure", - "$fuchsia_sdk_root/fidl:fuchsia.metrics", - "$fuchsia_sdk_root/fidl:fuchsia.net.interfaces", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk_root/fidl:fuchsia.web", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", + "$fuchsia_sdk/fidl:fuchsia.buildinfo", + "$fuchsia_sdk/fidl:fuchsia.component", + "$fuchsia_sdk/fidl:fuchsia.fonts", + "$fuchsia_sdk/fidl:fuchsia.intl", + "$fuchsia_sdk/fidl:fuchsia.kernel", + "$fuchsia_sdk/fidl:fuchsia.memorypressure", + "$fuchsia_sdk/fidl:fuchsia.metrics", + "$fuchsia_sdk/fidl:fuchsia.net.interfaces", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", + "$fuchsia_sdk/fidl:fuchsia.ui.input", + "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", + "$fuchsia_sdk/fidl:fuchsia.web", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "mouse-input-view:package", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index c52220401e1c8..60fa4434be838 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -23,22 +23,22 @@ executable("text-input-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk_root/fidl:fuchsia.component", - "$fuchsia_sdk_root/fidl:fuchsia.intl", - "$fuchsia_sdk_root/fidl:fuchsia.kernel", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", + "$fuchsia_sdk/fidl:fuchsia.component", + "$fuchsia_sdk/fidl:fuchsia.intl", + "$fuchsia_sdk/fidl:fuchsia.kernel", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", + "$fuchsia_sdk/fidl:fuchsia.ui.input", + "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "text-input-view:package", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index ba94060fb6923..713ccd6502f5a 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -23,28 +23,28 @@ executable("touch-input-test-bin") { libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk_root/fidl:fuchsia.buildinfo", - "$fuchsia_sdk_root/fidl:fuchsia.component", - "$fuchsia_sdk_root/fidl:fuchsia.fonts", - "$fuchsia_sdk_root/fidl:fuchsia.intl", - "$fuchsia_sdk_root/fidl:fuchsia.kernel", - "$fuchsia_sdk_root/fidl:fuchsia.memorypressure", - "$fuchsia_sdk_root/fidl:fuchsia.metrics", - "$fuchsia_sdk_root/fidl:fuchsia.net.interfaces", - "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk_root/fidl:fuchsia.web", - "$fuchsia_sdk_root/pkg:async", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", + "$fuchsia_sdk/fidl:fuchsia.buildinfo", + "$fuchsia_sdk/fidl:fuchsia.component", + "$fuchsia_sdk/fidl:fuchsia.fonts", + "$fuchsia_sdk/fidl:fuchsia.intl", + "$fuchsia_sdk/fidl:fuchsia.kernel", + "$fuchsia_sdk/fidl:fuchsia.memorypressure", + "$fuchsia_sdk/fidl:fuchsia.metrics", + "$fuchsia_sdk/fidl:fuchsia.net.interfaces", + "$fuchsia_sdk/fidl:fuchsia.tracing.provider", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", + "$fuchsia_sdk/fidl:fuchsia.ui.input", + "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", + "$fuchsia_sdk/fidl:fuchsia.web", + "$fuchsia_sdk/pkg:async", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:fidl_cpp", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/pkg:zx", "embedding-flutter-view:package", "touch-input-view:package", "//flutter/fml", diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn index d46f1a8b76359..6bcc5ba2e3669 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn @@ -13,8 +13,8 @@ source_set("check_view") { ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", ] } @@ -26,8 +26,8 @@ source_set("screenshot") { ] deps = [ - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", ] } @@ -41,17 +41,17 @@ source_set("portable_ui_test") { deps = [ ":check_view", - "$fuchsia_sdk_root/fidl:fuchsia.inspect", - "$fuchsia_sdk_root/fidl:fuchsia.logger", - "$fuchsia_sdk_root/fidl:fuchsia.ui.app", - "$fuchsia_sdk_root/fidl:fuchsia.ui.composition", - "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk_root/fidl:fuchsia.ui.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk_root/pkg:async-loop-testing", - "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", + "$fuchsia_sdk/fidl:fuchsia.inspect", + "$fuchsia_sdk/fidl:fuchsia.logger", + "$fuchsia_sdk/fidl:fuchsia.ui.app", + "$fuchsia_sdk/fidl:fuchsia.ui.composition", + "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", + "$fuchsia_sdk/fidl:fuchsia.ui.input", + "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", + "$fuchsia_sdk/fidl:fuchsia.ui.test.input", + "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", + "$fuchsia_sdk/pkg:async-loop-testing", + "$fuchsia_sdk/pkg:sys_component_cpp_testing", "//flutter/fml", ] } diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 6508bdaa97132..bf0143ef038ab 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -37,17 +37,17 @@ template("make_utils") { deps = invoker.deps + [ ":generate_build_info_cc_file", - "$fuchsia_sdk_root/fidl:fuchsia.feedback", - "$fuchsia_sdk_root/fidl:fuchsia.mem", - "$fuchsia_sdk_root/pkg:async-loop", - "$fuchsia_sdk_root/pkg:async-loop-cpp", - "$fuchsia_sdk_root/pkg:async-loop-default", - "$fuchsia_sdk_root/pkg:fdio", - "$fuchsia_sdk_root/pkg:sys_cpp", - "$fuchsia_sdk_root/pkg:inspect_component_cpp", - "$fuchsia_sdk_root/pkg:trace", - "$fuchsia_sdk_root/pkg:vfs_cpp", - "$fuchsia_sdk_root/pkg:zx", + "$fuchsia_sdk/fidl:fuchsia.feedback", + "$fuchsia_sdk/fidl:fuchsia.mem", + "$fuchsia_sdk/pkg:async-loop", + "$fuchsia_sdk/pkg:async-loop-cpp", + "$fuchsia_sdk/pkg:async-loop-default", + "$fuchsia_sdk/pkg:fdio", + "$fuchsia_sdk/pkg:sys_cpp", + "$fuchsia_sdk/pkg:inspect_component_cpp", + "$fuchsia_sdk/pkg:trace", + "$fuchsia_sdk/pkg:vfs_cpp", + "$fuchsia_sdk/pkg:zx", "//flutter/fml", "//flutter/third_party/tonic", ] @@ -102,8 +102,8 @@ executable("dart_utils_unittests") { ":utils_fixtures", "$dart_src/runtime:libdart_jit", "$dart_src/runtime/bin:dart_io_api", - "$fuchsia_sdk_root/pkg:inspect_component_cpp", - "$fuchsia_sdk_root/pkg:sys_cpp", + "$fuchsia_sdk/pkg:inspect_component_cpp", + "$fuchsia_sdk/pkg:sys_cpp", "//flutter/testing", ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 980830eca7c4d..ab566157bb7f6 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -460,7 +460,7 @@ optional("gpu") { sources += skia_gpu_vk_private if (is_fuchsia) { if (using_fuchsia_sdk) { - public_deps += [ "$fuchsia_sdk_root/pkg:vulkan" ] + public_deps += [ "$fuchsia_sdk/pkg:vulkan" ] } else { public_deps += [ "$_skia_root/src/graphics/lib/vulkan" ] } diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 9588f00f92948..445ea834e11c9 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -109,7 +109,7 @@ source_set("txt") { sources += [ "src/txt/platform_linux.cc" ] } else if (is_fuchsia) { sources += [ "src/txt/platform_fuchsia.cc" ] - deps += [ "$fuchsia_sdk_root/fidl:fuchsia.fonts" ] + deps += [ "$fuchsia_sdk/fidl:fuchsia.fonts" ] } else if (is_win) { sources += [ "src/txt/platform_windows.cc" ] } else { From 140321e172a2aa26b9fede1d1ad053bd739e1238 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:37:19 -0800 Subject: [PATCH 08/40] using_fuchsia_sdk --- build/config/fuchsia/gn_configs.gni | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 5f84ae095f246..92fb71dc878be 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -71,4 +71,5 @@ if (current_cpu != "") { fuchsia_arch_root = "${fuchsia_sdk}/obj/${fuchsia_arch_root}-api-${fuchsia_target_api_level}" -use_fuchsia_sdk = true +# third_party/googletest is still using this condition. +using_fuchsia_sdk = true From 3dbf5793fa11f2a2a2523fe3d4367571826bb404 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:45:08 -0800 Subject: [PATCH 09/40] arch_root --- display_list/BUILD.gn | 4 ++-- fml/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 2 +- .../tests/startup_integration_test/dart_aot_runner/BUILD.gn | 2 +- .../tests/startup_integration_test/dart_jit_runner/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/BUILD.gn | 6 +++--- .../fuchsia/flutter/tests/integration/embedder/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/mouse-input/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/text-input/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/touch-input/BUILD.gn | 2 +- shell/platform/fuchsia/runtime/dart/utils/BUILD.gn | 2 +- third_party/txt/BUILD.gn | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn index 18b711541cbf1..4112f12de57f1 100644 --- a/display_list/BUILD.gn +++ b/display_list/BUILD.gn @@ -143,7 +143,7 @@ if (enable_unittests) { # symbols. if (is_fuchsia) { libs = - [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ] + [ "${fuchsia_arch_root}/libzircon.so" ] } } @@ -175,7 +175,7 @@ if (enable_unittests) { # symbols. if (is_fuchsia) { libs = - [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ] + [ "${fuchsia_arch_root}/libzircon.so" ] } } diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 6c0adc4682a63..b927f29b64f8a 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -414,7 +414,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. libs = - [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ] + [ "${fuchsia_arch_root}/libzircon.so" ] } } diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 516665830df41..2639eee9e52e1 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -317,7 +317,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ ":jit_runner_sources_for_test", diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn index 91ff79d2b4ac5..51de58d699fff 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn @@ -22,7 +22,7 @@ executable("dart-aot-runner-integration-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.logger", diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn index 0a92606943137..f23087b761e5c 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn @@ -22,7 +22,7 @@ executable("dart-jit-runner-integration-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.logger", diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 03a605e92b625..9053ab1df0514 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -506,7 +506,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. @@ -540,7 +540,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. @@ -567,7 +567,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 3b532f9cead2b..23a2e9fd57fb7 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -21,7 +21,7 @@ executable("flutter-embedder-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.inspect", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index f412154478fd7..a6f01538938d3 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -20,7 +20,7 @@ executable("mouse-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index 60fa4434be838..09e4fdfad1b20 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -20,7 +20,7 @@ executable("text-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index 713ccd6502f5a..1a5d5e3ab94aa 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -20,7 +20,7 @@ executable("touch-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index bf0143ef038ab..803c55ed450b9 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -94,7 +94,7 @@ executable("dart_utils_unittests") { libs = [ # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so", + "${fuchsia_arch_root}/libzircon.so", ] deps = [ diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 445ea834e11c9..43570726f9a9c 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -174,7 +174,7 @@ if (enable_unittests) { # symbols. if (is_fuchsia) { libs = - [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ] + [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] } } } From ec1d40e8a0b87d1d00bc0e711068012a4cc83758 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:48:15 -0800 Subject: [PATCH 10/40] fuchsia_sdk_path -> fuchsia_sdk --- tools/fuchsia/dart/BUILD.gn | 2 +- tools/fuchsia/fidl/BUILD.gn | 2 +- tools/fuchsia/sdk/sdk_targets.gni | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/fuchsia/dart/BUILD.gn b/tools/fuchsia/dart/BUILD.gn index a1efa3520a65d..b68777d2b418c 100644 --- a/tools/fuchsia/dart/BUILD.gn +++ b/tools/fuchsia/dart/BUILD.gn @@ -17,6 +17,6 @@ if (current_toolchain == default_toolchain) { if (current_toolchain != default_toolchain) { sdk_targets("dart_library") { - meta = "$fuchsia_sdk_path/meta/manifest.json" + meta = "$fuchsia_sdk/meta/manifest.json" } } diff --git a/tools/fuchsia/fidl/BUILD.gn b/tools/fuchsia/fidl/BUILD.gn index 102b819b1b32a..e83e471c87a14 100644 --- a/tools/fuchsia/fidl/BUILD.gn +++ b/tools/fuchsia/fidl/BUILD.gn @@ -19,6 +19,6 @@ if (current_toolchain == default_toolchain) { if (current_toolchain != default_toolchain) { sdk_targets("fidl_library") { - meta = "$fuchsia_sdk_path/meta/manifest.json" + meta = "$fuchsia_sdk/meta/manifest.json" } } diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni index bc3470f6b498d..d5a7179ad0f53 100644 --- a/tools/fuchsia/sdk/sdk_targets.gni +++ b/tools/fuchsia/sdk/sdk_targets.gni @@ -6,8 +6,6 @@ import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") -_fuchsia_sdk_path = "//fuchsia/sdk/$host_os" - template("_fuchsia_dart_library") { assert(defined(invoker.meta), "The meta file content must be specified.") meta = invoker.meta @@ -67,7 +65,7 @@ template("_fuchsia_dart_library") { } dart_library(target_name) { - package_root = "${_fuchsia_sdk_path}/${meta.root}" + package_root = "${fuchsia_sdk}/${meta.root}" package_name = _output_name language_version = _dart_language_version sources = _sources @@ -83,7 +81,7 @@ template("_fuchsia_fidl_library") { fidl(target_name) { sources = [] foreach(source, meta.sources) { - sources += [ "$fuchsia_sdk_path/$source" ] + sources += [ "$fuchsia_sdk/$source" ] } public_deps = [] foreach(dep, meta.deps) { @@ -103,7 +101,7 @@ template("sdk_targets") { part_meta_json = { } part_meta = part.meta - part_meta_rebased = "$fuchsia_sdk_path/$part_meta" + part_meta_rebased = "$fuchsia_sdk/$part_meta" if (part_meta != "version_history.json") { part_meta_json = read_file(part_meta_rebased, "json") From d8a3f6f9d7966cc4ae2df88fb42bf5ddeb0f6e9b Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:51:50 -0800 Subject: [PATCH 11/40] pkg: -> pkg/ ; fidl: -> fidl/ --- .../flutter/third_party/googletest/BUILD.gn | 4 +- fml/BUILD.gn | 24 +++---- shell/common/BUILD.gn | 8 +-- .../fuchsia/dart-pkg/fuchsia/BUILD.gn | 4 +- .../platform/fuchsia/dart-pkg/zircon/BUILD.gn | 12 ++-- .../fuchsia/dart-pkg/zircon_ffi/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 40 +++++------ .../dart_aot_runner/BUILD.gn | 14 ++-- .../dart_jit_runner/BUILD.gn | 14 ++-- shell/platform/fuchsia/flutter/BUILD.gn | 66 +++++++++---------- .../tests/integration/embedder/BUILD.gn | 28 ++++---- .../tests/integration/mouse-input/BUILD.gn | 44 ++++++------- .../tests/integration/text-input/BUILD.gn | 32 ++++----- .../tests/integration/touch-input/BUILD.gn | 44 ++++++------- .../flutter/tests/integration/utils/BUILD.gn | 30 ++++----- .../fuchsia/runtime/dart/utils/BUILD.gn | 26 ++++---- skia/BUILD.gn | 2 +- third_party/txt/BUILD.gn | 2 +- 18 files changed, 198 insertions(+), 198 deletions(-) diff --git a/build/secondary/flutter/third_party/googletest/BUILD.gn b/build/secondary/flutter/third_party/googletest/BUILD.gn index 27770d98f37ed..8f866e72b7dc3 100644 --- a/build/secondary/flutter/third_party/googletest/BUILD.gn +++ b/build/secondary/flutter/third_party/googletest/BUILD.gn @@ -34,8 +34,8 @@ static_library("gtest") { if (is_fuchsia) { if (using_fuchsia_sdk) { deps = [ - "$fuchsia_sdk/pkg:fdio", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/pkg/fdio", + "${fuchsia_sdk}/pkg/zx", ] } else { deps = [ diff --git a/fml/BUILD.gn b/fml/BUILD.gn index b927f29b64f8a..fe0d77bf5b412 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -227,16 +227,16 @@ source_set("fml") { ] public_deps += [ - "$fuchsia_sdk/fidl:fuchsia.diagnostics", - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/pkg:async-cpp", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:async-loop-default", - "$fuchsia_sdk/pkg:component_incoming_cpp", - "$fuchsia_sdk/pkg:syslog_structured_backend", - "$fuchsia_sdk/pkg:trace", - "$fuchsia_sdk/pkg:trace-engine", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.diagnostics", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/pkg/async-cpp", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/async-loop-default", + "${fuchsia_sdk}/pkg/component_incoming_cpp", + "${fuchsia_sdk}/pkg/syslog_structured_backend", + "${fuchsia_sdk}/pkg/trace", + "${fuchsia_sdk}/pkg/trace-engine", + "${fuchsia_sdk}/pkg/zx", ] } @@ -407,8 +407,8 @@ if (enable_unittests) { if (is_fuchsia) { deps += [ - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", ] # This is needed for //flutter/third_party/googletest for linking zircon diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index dfdc393c99790..c8a3e47382c85 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -340,10 +340,10 @@ if (enable_unittests) { sources += [ "shell_fuchsia_unittests.cc" ] deps += [ - "$fuchsia_sdk/fidl:fuchsia.intl", - "$fuchsia_sdk/fidl:fuchsia.settings", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_cpp", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.settings", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", ] } else if (shell_enable_gl) { # TODO(63837): This test is hard-coded to use a TestGLSurface so it cannot diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index 5981eeb189a72..c04a41690e62f 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn @@ -19,13 +19,13 @@ source_set("sdk_ext") { ] deps = [ - "$fuchsia_sdk/pkg:async-cpp", + "${fuchsia_sdk}/pkg/async-cpp", "../zircon", "//flutter/fml", "//flutter/third_party/tonic", ] - public_deps = [ "$fuchsia_sdk/pkg:zx" ] + public_deps = [ "${fuchsia_sdk}/pkg/zx" ] public_configs = [ ":sdk_ext_config" ] } diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn index 8ba7f6dca8775..2630afd0ef985 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn @@ -29,12 +29,12 @@ source_set("zircon") { ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.io", - "$fuchsia_sdk/pkg:async-cpp", - "$fuchsia_sdk/pkg:async-default", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:fdio", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.io", + "${fuchsia_sdk}/pkg/async-cpp", + "${fuchsia_sdk}/pkg/async-default", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/fdio", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", "//flutter/third_party/tonic", ] diff --git a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn index 1033e4a2b6eff..b98973a1d0221 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn @@ -27,7 +27,7 @@ shared_library("zircon_ffi") { deps = [ "$dart_src/runtime:dart_api", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", ] } diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 2639eee9e52e1..2b2e55c10defb 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -43,28 +43,28 @@ template("runner_sources") { } public_deps = [ - "$fuchsia_sdk/pkg:sys_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", "//flutter/fml", ] + dart_public_deps deps = [ - "$fuchsia_sdk/fidl:fuchsia.component.runner", - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/fidl:fuchsia.test", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-cpp", - "$fuchsia_sdk/pkg:async-default", - "$fuchsia_sdk/pkg:async-loop", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:async-loop-default", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:inspect", - "$fuchsia_sdk/pkg:inspect_component_cpp", - "$fuchsia_sdk/pkg:sys_cpp", - "$fuchsia_sdk/pkg:sys_cpp_testing", - "$fuchsia_sdk/pkg:trace", - "$fuchsia_sdk/pkg:vfs_cpp", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.component.runner", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.test", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-cpp", + "${fuchsia_sdk}/pkg/async-default", + "${fuchsia_sdk}/pkg/async-loop", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/async-loop-default", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/inspect", + "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", + "${fuchsia_sdk}/pkg/sys_cpp_testing", + "${fuchsia_sdk}/pkg/trace", + "${fuchsia_sdk}/pkg/vfs_cpp", + "${fuchsia_sdk}/pkg/zx", "fidl:dart_test", "//flutter/common", "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia", @@ -100,8 +100,8 @@ template("runner") { deps = [ ":" + target_name + "_runner_sources", - "$fuchsia_sdk/pkg:inspect_component_cpp", - "$fuchsia_sdk/pkg:trace-provider-so", + "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/trace-provider-so", ] + extra_deps } } diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn index 51de58d699fff..4ea5ec95a0891 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn @@ -25,13 +25,13 @@ executable("dart-aot-runner-integration-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "../dart_echo_server:aot_echo_package", "//flutter/fml", "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test", diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn index f23087b761e5c..cfb67efc9c30c 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn @@ -25,13 +25,13 @@ executable("dart-jit-runner-integration-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "../dart_echo_server:jit_echo_package", "//flutter/fml", "//flutter/shell/platform/fuchsia/dart_runner/fidl:dart_test", diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 9053ab1df0514..bc323bc3beacf 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -139,40 +139,40 @@ template("runner_sources") { ] public_deps = [ - "$fuchsia_sdk/pkg:inspect", - "$fuchsia_sdk/pkg:inspect_component_cpp", - "$fuchsia_sdk/pkg:sys_cpp", + "${fuchsia_sdk}/pkg/inspect", + "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", "//flutter/shell/platform/fuchsia/runtime/dart/utils", ] + flutter_public_deps deps = [ - "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk/fidl:fuchsia.component.runner", - "$fuchsia_sdk/fidl:fuchsia.fonts", - "$fuchsia_sdk/fidl:fuchsia.images", - "$fuchsia_sdk/fidl:fuchsia.intl", - "$fuchsia_sdk/fidl:fuchsia.io", - "$fuchsia_sdk/fidl:fuchsia.media", - "$fuchsia_sdk/fidl:fuchsia.memorypressure", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.composition", - "$fuchsia_sdk/fidl:fuchsia.ui.input", - "$fuchsia_sdk/fidl:fuchsia.ui.input3", - "$fuchsia_sdk/fidl:fuchsia.ui.pointer", - "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.views", - "$fuchsia_sdk/pkg:async-cpp", - "$fuchsia_sdk/pkg:async-default", - "$fuchsia_sdk/pkg:async-loop", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:fdio", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:trace", - "$fuchsia_sdk/pkg:trace-engine", - "$fuchsia_sdk/pkg:trace-provider-so", - "$fuchsia_sdk/pkg:vfs_cpp", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", + "${fuchsia_sdk}/fidl/fuchsia.component.runner", + "${fuchsia_sdk}/fidl/fuchsia.fonts", + "${fuchsia_sdk}/fidl/fuchsia.images", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.io", + "${fuchsia_sdk}/fidl/fuchsia.media", + "${fuchsia_sdk}/fidl/fuchsia.memorypressure", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.composition", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.input3", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointer", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.views", + "${fuchsia_sdk}/pkg/async-cpp", + "${fuchsia_sdk}/pkg/async-default", + "${fuchsia_sdk}/pkg/async-loop", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/fdio", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/trace", + "${fuchsia_sdk}/pkg/trace-engine", + "${fuchsia_sdk}/pkg/trace-provider-so", + "${fuchsia_sdk}/pkg/vfs_cpp", + "${fuchsia_sdk}/pkg/zx", "//flutter/shell/platform/fuchsia/dart-pkg/fuchsia", "//flutter/shell/platform/fuchsia/dart-pkg/zircon", ] + flutter_deps @@ -226,9 +226,9 @@ template("flutter_runner") { deps = [ ":flutter_runner_sources${product_suffix}", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:trace", - "$fuchsia_sdk/pkg:trace-provider-so", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/trace", + "${fuchsia_sdk}/pkg/trace-provider-so", ] + extra_deps # The flags below are needed so that Dart's CPU profiler can walk the diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 23a2e9fd57fb7..9cfc5705f97dd 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -24,20 +24,20 @@ executable("flutter-embedder-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.inspect", - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.composition", - "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.inspect", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.composition", + "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", + "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:screenshot", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index a6f01538938d3..726d9dd3c3df5 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -23,28 +23,28 @@ executable("mouse-input-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk/fidl:fuchsia.buildinfo", - "$fuchsia_sdk/fidl:fuchsia.component", - "$fuchsia_sdk/fidl:fuchsia.fonts", - "$fuchsia_sdk/fidl:fuchsia.intl", - "$fuchsia_sdk/fidl:fuchsia.kernel", - "$fuchsia_sdk/fidl:fuchsia.memorypressure", - "$fuchsia_sdk/fidl:fuchsia.metrics", - "$fuchsia_sdk/fidl:fuchsia.net.interfaces", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk/fidl:fuchsia.ui.input", - "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk/fidl:fuchsia.web", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", + "${fuchsia_sdk}/fidl/fuchsia.buildinfo", + "${fuchsia_sdk}/fidl/fuchsia.component", + "${fuchsia_sdk}/fidl/fuchsia.fonts", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.kernel", + "${fuchsia_sdk}/fidl/fuchsia.memorypressure", + "${fuchsia_sdk}/fidl/fuchsia.metrics", + "${fuchsia_sdk}/fidl/fuchsia.net.interfaces", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene", + "${fuchsia_sdk}/fidl/fuchsia.web", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "mouse-input-view:package", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index 09e4fdfad1b20..657d944f53685 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -23,22 +23,22 @@ executable("text-input-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk/fidl:fuchsia.component", - "$fuchsia_sdk/fidl:fuchsia.intl", - "$fuchsia_sdk/fidl:fuchsia.kernel", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk/fidl:fuchsia.ui.input", - "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", + "${fuchsia_sdk}/fidl/fuchsia.component", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.kernel", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "text-input-view:package", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index 1a5d5e3ab94aa..07f3c3f6ec75f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -23,28 +23,28 @@ executable("touch-input-test-bin") { libs = [ "${fuchsia_arch_root}/libzircon.so" ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.accessibility.semantics", - "$fuchsia_sdk/fidl:fuchsia.buildinfo", - "$fuchsia_sdk/fidl:fuchsia.component", - "$fuchsia_sdk/fidl:fuchsia.fonts", - "$fuchsia_sdk/fidl:fuchsia.intl", - "$fuchsia_sdk/fidl:fuchsia.kernel", - "$fuchsia_sdk/fidl:fuchsia.memorypressure", - "$fuchsia_sdk/fidl:fuchsia.metrics", - "$fuchsia_sdk/fidl:fuchsia.net.interfaces", - "$fuchsia_sdk/fidl:fuchsia.tracing.provider", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk/fidl:fuchsia.ui.input", - "$fuchsia_sdk/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk/fidl:fuchsia.web", - "$fuchsia_sdk/pkg:async", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:fidl_cpp", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", + "${fuchsia_sdk}/fidl/fuchsia.buildinfo", + "${fuchsia_sdk}/fidl/fuchsia.component", + "${fuchsia_sdk}/fidl/fuchsia.fonts", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.kernel", + "${fuchsia_sdk}/fidl/fuchsia.memorypressure", + "${fuchsia_sdk}/fidl/fuchsia.metrics", + "${fuchsia_sdk}/fidl/fuchsia.net.interfaces", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene", + "${fuchsia_sdk}/fidl/fuchsia.web", + "${fuchsia_sdk}/pkg/async", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", + "${fuchsia_sdk}/pkg/zx", "embedding-flutter-view:package", "touch-input-view:package", "//flutter/fml", diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn index 6bcc5ba2e3669..f00966cb5f75d 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn @@ -13,8 +13,8 @@ source_set("check_view") { ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", ] } @@ -26,8 +26,8 @@ source_set("screenshot") { ] deps = [ - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", ] } @@ -41,17 +41,17 @@ source_set("portable_ui_test") { deps = [ ":check_view", - "$fuchsia_sdk/fidl:fuchsia.inspect", - "$fuchsia_sdk/fidl:fuchsia.logger", - "$fuchsia_sdk/fidl:fuchsia.ui.app", - "$fuchsia_sdk/fidl:fuchsia.ui.composition", - "$fuchsia_sdk/fidl:fuchsia.ui.display.singleton", - "$fuchsia_sdk/fidl:fuchsia.ui.input", - "$fuchsia_sdk/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk/fidl:fuchsia.ui.test.input", - "$fuchsia_sdk/fidl:fuchsia.ui.test.scene", - "$fuchsia_sdk/pkg:async-loop-testing", - "$fuchsia_sdk/pkg:sys_component_cpp_testing", + "${fuchsia_sdk}/fidl/fuchsia.inspect", + "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.composition", + "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.observation.geometry", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.scene", + "${fuchsia_sdk}/pkg/async-loop-testing", + "${fuchsia_sdk}/pkg/sys_component_cpp_testing", "//flutter/fml", ] } diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 803c55ed450b9..ffe22b585c29a 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -37,17 +37,17 @@ template("make_utils") { deps = invoker.deps + [ ":generate_build_info_cc_file", - "$fuchsia_sdk/fidl:fuchsia.feedback", - "$fuchsia_sdk/fidl:fuchsia.mem", - "$fuchsia_sdk/pkg:async-loop", - "$fuchsia_sdk/pkg:async-loop-cpp", - "$fuchsia_sdk/pkg:async-loop-default", - "$fuchsia_sdk/pkg:fdio", - "$fuchsia_sdk/pkg:sys_cpp", - "$fuchsia_sdk/pkg:inspect_component_cpp", - "$fuchsia_sdk/pkg:trace", - "$fuchsia_sdk/pkg:vfs_cpp", - "$fuchsia_sdk/pkg:zx", + "${fuchsia_sdk}/fidl/fuchsia.feedback", + "${fuchsia_sdk}/fidl/fuchsia.mem", + "${fuchsia_sdk}/pkg/async-loop", + "${fuchsia_sdk}/pkg/async-loop-cpp", + "${fuchsia_sdk}/pkg/async-loop-default", + "${fuchsia_sdk}/pkg/fdio", + "${fuchsia_sdk}/pkg/sys_cpp", + "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/trace", + "${fuchsia_sdk}/pkg/vfs_cpp", + "${fuchsia_sdk}/pkg/zx", "//flutter/fml", "//flutter/third_party/tonic", ] @@ -102,8 +102,8 @@ executable("dart_utils_unittests") { ":utils_fixtures", "$dart_src/runtime:libdart_jit", "$dart_src/runtime/bin:dart_io_api", - "$fuchsia_sdk/pkg:inspect_component_cpp", - "$fuchsia_sdk/pkg:sys_cpp", + "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", "//flutter/testing", ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index ab566157bb7f6..7ed4830ce9259 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -460,7 +460,7 @@ optional("gpu") { sources += skia_gpu_vk_private if (is_fuchsia) { if (using_fuchsia_sdk) { - public_deps += [ "$fuchsia_sdk/pkg:vulkan" ] + public_deps += [ "${fuchsia_sdk}/pkg/vulkan" ] } else { public_deps += [ "$_skia_root/src/graphics/lib/vulkan" ] } diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 43570726f9a9c..703a0eba41c4a 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -109,7 +109,7 @@ source_set("txt") { sources += [ "src/txt/platform_linux.cc" ] } else if (is_fuchsia) { sources += [ "src/txt/platform_fuchsia.cc" ] - deps += [ "$fuchsia_sdk/fidl:fuchsia.fonts" ] + deps += [ "${fuchsia_sdk}/fidl/fuchsia.fonts" ] } else if (is_win) { sources += [ "src/txt/platform_windows.cc" ] } else { From 593da972c5bc8476c23fe1455741ea0cf5eb1824 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:53:51 -0800 Subject: [PATCH 12/40] DEPS --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index dd8903d6625e0..cb50e135bd763 100644 --- a/DEPS +++ b/DEPS @@ -257,7 +257,7 @@ vars = { # The version / instance id of the cipd:chromium/fuchsia/test-scripts which # will be used altogether with fuchsia-sdk to setup the build / test # environment. - 'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC', + 'fuchsia_test_scripts_version': 'EAdD2YcYwVrhF2q_zR6xUvPkcKlPb1tJyM_6_oOc84kC', # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be # used altogether with fuchsia-sdk to generate gn based build rules. From 0e69cb1b879468c3f1aeac39f618c9f0da56d76f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:58:43 -0800 Subject: [PATCH 13/40] format --- display_list/BUILD.gn | 8 +++----- flow/BUILD.gn | 2 +- fml/BUILD.gn | 5 ++--- lib/snapshot/BUILD.gn | 2 +- lib/ui/BUILD.gn | 2 +- shell/common/BUILD.gn | 2 +- shell/platform/BUILD.gn | 2 +- shell/platform/fuchsia/BUILD.gn | 2 +- shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/fidl/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/kernel/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/BUILD.gn | 2 +- shell/platform/fuchsia/flutter/kernel/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/embedder/BUILD.gn | 2 +- .../tests/integration/embedder/child-view/BUILD.gn | 2 +- .../tests/integration/embedder/parent-view/BUILD.gn | 2 +- .../flutter/tests/integration/mouse-input/BUILD.gn | 2 +- .../integration/mouse-input/mouse-input-view/BUILD.gn | 2 +- .../fuchsia/flutter/tests/integration/text-input/BUILD.gn | 2 +- .../tests/integration/text-input/text-input-view/BUILD.gn | 2 +- .../flutter/tests/integration/touch-input/BUILD.gn | 2 +- .../touch-input/embedding-flutter-view/BUILD.gn | 2 +- .../integration/touch-input/touch-input-view/BUILD.gn | 2 +- shell/platform/fuchsia/runtime/dart/utils/BUILD.gn | 2 +- shell/testing/BUILD.gn | 2 +- sky/packages/sky_engine/BUILD.gn | 2 +- tools/fuchsia/fidl/BUILD.gn | 2 +- tools/fuchsia/fidl/fidl.gni | 2 +- tools/fuchsia/sdk/sdk_targets.gni | 2 +- 31 files changed, 34 insertions(+), 37 deletions(-) diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn index 4112f12de57f1..c882e95189814 100644 --- a/display_list/BUILD.gn +++ b/display_list/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") config("display_list_config") { defines = [] @@ -142,8 +142,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. if (is_fuchsia) { - libs = - [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] } } @@ -174,8 +173,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. if (is_fuchsia) { - libs = - [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] } } diff --git a/flow/BUILD.gn b/flow/BUILD.gn index 82561a1f53392..5e1c3df225348 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -2,11 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") source_set("flow") { sources = [ diff --git a/fml/BUILD.gn b/fml/BUILD.gn index fe0d77bf5b412..3d7b1084c9e05 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") source_set("fml") { sources = [ @@ -413,8 +413,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = - [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/libzircon.so" ] } } diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 8fe1a2a7ffd38..99ed8c6b7b439 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -3,11 +3,11 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/build/bin_to_obj.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/lib/ui/dart_ui.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("$dart_src/utils/compile_platform.gni") # Generates the Dart/Flutter core platform files and tools. diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 41e6d0a2b386f..7ebaf94dea692 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -2,11 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") source_set("ui") { cflags = [ diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index c8a3e47382c85..a4b4901fa641e 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -2,11 +2,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") # Template to generate a dart embedder resource.cc file. # Required invoker inputs: diff --git a/shell/platform/BUILD.gn b/shell/platform/BUILD.gn index 7617844042fc4..3ccab57f00fd8 100644 --- a/shell/platform/BUILD.gn +++ b/shell/platform/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/shell/platform/config.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("platform") { if (is_mac || is_ios) { diff --git a/shell/platform/fuchsia/BUILD.gn b/shell/platform/fuchsia/BUILD.gn index a2d7ae06a7f0a..4de6e16a88c83 100644 --- a/shell/platform/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/BUILD.gn @@ -4,11 +4,11 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart.gni") import("//flutter/tools/fuchsia/fuchsia_host_bundle.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") product_suffix = "" diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn index 2630afd0ef985..ae17ef02af027 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") config("zircon_config") { diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 2b2e55c10defb..f7181758381fc 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -4,12 +4,12 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/fuchsia_config.gni") import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") import("//flutter/tools/fuchsia/fuchsia_libs.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") template("runner_sources") { assert(defined(invoker.product), "runner_sources must define product") diff --git a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn index dc12f2c82c4a6..27a97f7319af3 100644 --- a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") fidl("dart_test") { name = "dart.test" diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn index ac3735207cc3a..f0319dee65f51 100644 --- a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn @@ -3,9 +3,9 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("$dart_src/utils/compile_platform.gni") compile_platform("kernel_platform_files") { diff --git a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn index 955f6b5f5608a..0c87cc9c27384 100644 --- a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn @@ -3,10 +3,10 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") import("//flutter/tools/fuchsia/dart_kernel.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("$dart_src/utils/compile_platform.gni") dart_kernel("vmservice_product_aot_kernel") { diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index bc323bc3beacf..0ada1e7933ecb 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -4,7 +4,6 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/shell/config.gni") import("//flutter/shell/gpu/gpu.gni") @@ -12,6 +11,7 @@ import("//flutter/testing/testing.gni") import("//flutter/tools/fuchsia/dart.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") import("//flutter/tools/fuchsia/fuchsia_libs.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/vulkan/config.gni") # Fuchsia uses its own custom Surface implementation. diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn index ac0c05e5d8fd2..0e4cdb25f8f85 100644 --- a/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -3,9 +3,9 @@ # found in the LICENSE file. import("//build/compiled_action.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/tools/fuchsia/dart.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("$dart_src/utils/compile_platform.gni") compile_platform("kernel_platform_files") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 9cfc5705f97dd..1ffaf7c8c4edf 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -4,8 +4,8 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("tests") { testonly = true diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn index 1ad07c2d8eebd..08cb1bd9588a0 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn index e20c11c89887f..0407e790c75ba 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index 726d9dd3c3df5..656205fecb800 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -4,8 +4,8 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") group("tests") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn index da81f3be7f8d1..1e59eeafe42a5 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index 657d944f53685..f1e7e5d45175f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -4,8 +4,8 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") group("tests") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn index ddd30fe1776dd..1f95d20a124db 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index 07f3c3f6ec75f..b4a34ffae3d39 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -4,8 +4,8 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") group("tests") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn index a1f13b7b83d09..e532a158c8749 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn index 69dfa7e917251..2ba2fa5a7373a 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn @@ -2,10 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/flutter/flutter_component.gni") import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index ffe22b585c29a..447b0548d581f 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -4,9 +4,9 @@ assert(is_fuchsia) -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") config("utils_config") { include_dirs = [ "../../.." ] diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn index 1cb9e46dc3cf3..378566036a520 100644 --- a/shell/testing/BUILD.gn +++ b/shell/testing/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") shell_gpu_configuration("tester_gpu_configuration") { enable_software = true diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index a19e1c407bacc..47f5a913cf7ae 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/build/dart/rules.gni") import("//flutter/lib/ui/dart_ui.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/web_sdk/web_sdk.gni") import("$dart_src/sdk/lib/_http/http_sources.gni") import("$dart_src/sdk/lib/_internal/js_runtime/interceptors_sources.gni") diff --git a/tools/fuchsia/fidl/BUILD.gn b/tools/fuchsia/fidl/BUILD.gn index e83e471c87a14..722406112a98f 100644 --- a/tools/fuchsia/fidl/BUILD.gn +++ b/tools/fuchsia/fidl/BUILD.gn @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") import("//flutter/tools/fuchsia/fidl/toolchain.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/sdk/sdk_targets.gni") import("//flutter/tools/fuchsia/toolchain/basic_toolchain.gni") diff --git a/tools/fuchsia/fidl/fidl.gni b/tools/fuchsia/fidl/fidl.gni index 32fff1c044dce..ecdf0e843184a 100644 --- a/tools/fuchsia/fidl/fidl.gni +++ b/tools/fuchsia/fidl/fidl.gni @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/fidl/toolchain.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") # Declares a FIDL library. # diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni index d5a7179ad0f53..24a87fed7749d 100644 --- a/tools/fuchsia/sdk/sdk_targets.gni +++ b/tools/fuchsia/sdk/sdk_targets.gni @@ -2,9 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/tools/fuchsia/dart/dart_library.gni") import("//flutter/tools/fuchsia/fidl/fidl.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") template("_fuchsia_dart_library") { assert(defined(invoker.meta), "The meta file content must be specified.") From bf2c1edcc0b22287b32f3d90a40fd2a57b781f9c Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 13:59:31 -0800 Subject: [PATCH 14/40] wrong location --- tools/fuchsia/with_envs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index c4336a51b3833..1344382d49262 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,7 +29,7 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') - os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/gn-sdk/src') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src') with subprocess.Popen(sys.argv[1:]) as proc: try: From 319497d7204b54f8b9d834671ec3233f05bbbbfc Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 14:00:28 -0800 Subject: [PATCH 15/40] format --- tools/fuchsia/with_envs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index 1344382d49262..d0ea483abe11c 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,7 +29,9 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') - os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join( + os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src' + ) with subprocess.Popen(sys.argv[1:]) as proc: try: From 49a33e1efe96e38808f58121e0f09f376cadc7ba Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 15:12:46 -0800 Subject: [PATCH 16/40] wrong zircon location --- DEPS | 9 -- build/config/fuchsia/gn_configs.gni | 5 +- display_list/BUILD.gn | 4 +- fml/BUILD.gn | 2 +- shell/platform/fuchsia/dart_runner/BUILD.gn | 2 +- .../fuchsia/dart_runner/fidl/BUILD.gn | 8 +- .../fuchsia/dart_runner/fidl/meta.json | 9 -- .../dart_aot_runner/BUILD.gn | 6 +- .../dart_jit_runner/BUILD.gn | 6 +- shell/platform/fuchsia/flutter/BUILD.gn | 6 +- .../tests/integration/embedder/BUILD.gn | 2 +- .../tests/integration/mouse-input/BUILD.gn | 2 +- .../tests/integration/text-input/BUILD.gn | 2 +- .../tests/integration/touch-input/BUILD.gn | 2 +- .../fuchsia/runtime/dart/utils/BUILD.gn | 2 +- tools/fuchsia/fidl/BUILD.gn | 24 --- tools/fuchsia/fidl/fidl.gni | 48 ------ tools/fuchsia/fidl/fidl_library.gni | 151 ------------------ tools/fuchsia/fidl/gen_response_file.py | 52 ------ tools/fuchsia/fidl/toolchain.gni | 5 - tools/fuchsia/sdk/sdk_targets.gni | 22 +-- tools/gn | 1 - 22 files changed, 24 insertions(+), 346 deletions(-) delete mode 100644 shell/platform/fuchsia/dart_runner/fidl/meta.json delete mode 100644 tools/fuchsia/fidl/BUILD.gn delete mode 100644 tools/fuchsia/fidl/fidl.gni delete mode 100644 tools/fuchsia/fidl/fidl_library.gni delete mode 100755 tools/fuchsia/fidl/gen_response_file.py delete mode 100644 tools/fuchsia/fidl/toolchain.gni diff --git a/DEPS b/DEPS index cb50e135bd763..dd49bd6c6997a 100644 --- a/DEPS +++ b/DEPS @@ -1236,15 +1236,6 @@ hooks = [ Var('mac_sdk_min') ] }, - { - 'name': 'Erase arch/ from fuchsia sdk', - 'pattern': '.', - 'action': [ - 'rm', - '-rf', - 'src/fuchsia/sdk/linux/arch', - ], - }, { 'name': 'Generate Fuchsia GN build rules', 'pattern': '.', diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 92fb71dc878be..38e624b62a9e2 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -6,8 +6,6 @@ # https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni # with some local modifications to match the flutter setup. -assert(is_fuchsia) - declare_args() { # Path to the fuchsia SDK. This is intended for use in other templates & # rules to reference the contents of the fuchsia SDK. @@ -73,3 +71,6 @@ fuchsia_arch_root = # third_party/googletest is still using this condition. using_fuchsia_sdk = true + +# Override the default fuchsia_gn_sdk in dart. +fuchsia_gn_sdk = "//flutter/fuchsia/tools/gn-sdk" diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn index c882e95189814..a676ab3c5d889 100644 --- a/display_list/BUILD.gn +++ b/display_list/BUILD.gn @@ -142,7 +142,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. if (is_fuchsia) { - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] } } @@ -173,7 +173,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. if (is_fuchsia) { - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] } } diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 3d7b1084c9e05..b1d9185a81780 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -413,7 +413,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] } } diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index f7181758381fc..607c3de1fef03 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -317,7 +317,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ ":jit_runner_sources_for_test", diff --git a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn index 27a97f7319af3..3923e527169ad 100644 --- a/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/fidl/BUILD.gn @@ -2,11 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/fidl/fidl.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni") -fidl("dart_test") { - name = "dart.test" - meta = "meta.json" +fidl_library("dart_test") { + library_name = "dart.test" sources = [ "echo.fidl" ] } diff --git a/shell/platform/fuchsia/dart_runner/fidl/meta.json b/shell/platform/fuchsia/dart_runner/fidl/meta.json deleted file mode 100644 index 34fa696420070..0000000000000 --- a/shell/platform/fuchsia/dart_runner/fidl/meta.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "deps": [], - "name": "dart.test", - "root": "dart.test", - "sources": [ - "../../../flutter/shell/platform/fuchsia/dart_runner/fidl/echo.fidl" - ], - "type": "fidl_library" -} \ No newline at end of file diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn index 4ea5ec95a0891..482378574aa6c 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn @@ -2,11 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") - import("//flutter/tools/fuchsia/dart/dart_component.gni") -import("//flutter/tools/fuchsia/fidl/fidl.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni") group("tests") { testonly = true @@ -22,7 +20,7 @@ executable("dart-aot-runner-integration-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.logger", diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn index cfb67efc9c30c..83e5a25451534 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn @@ -2,11 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") - import("//flutter/tools/fuchsia/dart/dart_component.gni") -import("//flutter/tools/fuchsia/fidl/fidl.gni") import("//flutter/tools/fuchsia/fuchsia_archive.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("tests") { testonly = true @@ -22,7 +20,7 @@ executable("dart-jit-runner-integration-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.logger", diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 0ada1e7933ecb..c47561cb43bd0 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -506,7 +506,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. @@ -540,7 +540,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. @@ -567,7 +567,7 @@ if (enable_unittests) { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] # The use of these dependencies is temporary and will be moved behind the # embedder API. diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 1ffaf7c8c4edf..4af5ae5df9a0f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -21,7 +21,7 @@ executable("flutter-embedder-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.inspect", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index 656205fecb800..d976e940ffa59 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -20,7 +20,7 @@ executable("mouse-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index f1e7e5d45175f..c918b5a4a5cd3 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -20,7 +20,7 @@ executable("text-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index b4a34ffae3d39..984456cbbb004 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -20,7 +20,7 @@ executable("touch-input-test-bin") { # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - libs = [ "${fuchsia_arch_root}/libzircon.so" ] + libs = [ "${fuchsia_arch_root}/sysroot/lib/libzircon.so" ] deps = [ "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 447b0548d581f..08660b51436b5 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -94,7 +94,7 @@ executable("dart_utils_unittests") { libs = [ # This is needed for //flutter/third_party/googletest for linking zircon # symbols. - "${fuchsia_arch_root}/libzircon.so", + "${fuchsia_arch_root}/sysroot/lib/libzircon.so", ] deps = [ diff --git a/tools/fuchsia/fidl/BUILD.gn b/tools/fuchsia/fidl/BUILD.gn deleted file mode 100644 index 722406112a98f..0000000000000 --- a/tools/fuchsia/fidl/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//flutter/tools/fuchsia/fidl/fidl.gni") -import("//flutter/tools/fuchsia/fidl/toolchain.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") -import("//flutter/tools/fuchsia/sdk/sdk_targets.gni") -import("//flutter/tools/fuchsia/toolchain/basic_toolchain.gni") - -# A toolchain dedicated to processing FIDL libraries. -# The only targets in this toolchain are action() targets, so it -# has no real tools. But every toolchain needs stamp and copy. -if (current_toolchain == default_toolchain) { - basic_toolchain("fidling") { - expected_label = fidl_toolchain - } -} - -if (current_toolchain != default_toolchain) { - sdk_targets("fidl_library") { - meta = "$fuchsia_sdk/meta/manifest.json" - } -} diff --git a/tools/fuchsia/fidl/fidl.gni b/tools/fuchsia/fidl/fidl.gni deleted file mode 100644 index ecdf0e843184a..0000000000000 --- a/tools/fuchsia/fidl/fidl.gni +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//flutter/tools/fuchsia/fidl/toolchain.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") - -# Declares a FIDL library. -# -# Depending on the toolchain in which this targets is expanded, it will yield -# different results: -# - in the FIDL toolchain, it will compile its source files into an -# intermediate representation consumable by language bindings generators; -# - in the target or shared toolchain, this will produce a source_set -# containing language-specific bindings. -template("fidl") { - # Allow generated targets visibility to their dependant generated targets - if (defined(invoker.visibility)) { - invoker.visibility += [ ":*" ] - } - - assert(!defined(invoker.deps), - "All FIDL dependencies are inherently " + - "public, use 'public_deps' instead of 'deps'.") - - if (current_toolchain == fidl_toolchain) { - import("//flutter/tools/fuchsia/fidl/fidl_library.gni") - - not_needed(invoker, [ "meta" ]) - - fidl_library(target_name) { - forward_variables_from(invoker, "*") - } - } else if (current_toolchain == default_toolchain) { - not_needed(invoker, - [ - "name", - "sources", - ]) - - fuchsia_fidl_library(target_name) { - forward_variables_from(invoker, "*") - } - } else { - not_needed(invoker, "*") - not_needed("*") - } -} diff --git a/tools/fuchsia/fidl/fidl_library.gni b/tools/fuchsia/fidl/fidl_library.gni deleted file mode 100644 index ae8299485a48a..0000000000000 --- a/tools/fuchsia/fidl/fidl_library.gni +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//flutter/tools/executable_action.gni") -import("//flutter/tools/fuchsia/fidl/fidl.gni") -import("//flutter/tools/fuchsia/fidl/toolchain.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/config/config.gni") - -# TODO(zijiehe): May use fidl_library in gn-sdk if possible. - http://crbug.com/40935282 - -# Generates some representation of a FIDL library that's consumable by Language -# bindings generators. -# -# The parameters for this template are defined in //flutter/tools/fuchsia/fidl/fidl.gni. The -# relevant parameters in this template are: -# - name; -# - sources. - -template("fidl_library") { - assert( - current_toolchain == fidl_toolchain, - "This template can only be used in the FIDL toolchain $fidl_toolchain.") - - assert(defined(invoker.sources), "A FIDL library requires some sources.") - - assert(fuchsia_target_api_level != -1, - "Must set a target api level when using FIDL libraries") - - library_name = target_name - if (defined(invoker.name)) { - library_name = invoker.name - } - - response_file = "$target_gen_dir/$target_name.args" - fidl_stem = "$target_gen_dir/$target_name.fidl" - json_representation = "$fidl_stem.json" - - coding_tables = "$fidl_stem.tables.c" - - main_target_name = target_name - response_file_target_name = "${target_name}_response_file" - compilation_target_name = "${target_name}_compile" - - # Only artifacts that have various associated FIDL generated targets. - fidl_deps = [] - - # Artifacts other than FIDL, that are also dependencies. - non_fidl_deps = [] - - if (defined(invoker.non_fidl_deps)) { - non_fidl_deps += invoker.non_fidl_deps - } - - if (defined(invoker.deps)) { - fidl_deps += invoker.deps - non_fidl_deps - } - if (defined(invoker.public_deps)) { - fidl_deps += invoker.public_deps - } - - action(response_file_target_name) { - visibility = [ ":*" ] - - script = "//flutter/tools/fuchsia/fidl/gen_response_file.py" - - forward_variables_from(invoker, - [ - "deps", - "public_deps", - "sources", - "testonly", - ]) - - libraries = "$target_gen_dir/$main_target_name.libraries" - - outputs = [ - response_file, - libraries, - ] - - args = [ - "--out-response-file", - rebase_path(response_file, root_build_dir), - "--out-libraries", - rebase_path(libraries, root_build_dir), - "--json", - rebase_path(json_representation, root_build_dir), - "--tables", - rebase_path(coding_tables, root_build_dir), - "--name", - library_name, - "--available", - "fuchsia:${fuchsia_target_api_level}", - "--sources", - ] + rebase_path(sources, root_build_dir) - - if (fidl_deps != []) { - dep_libraries = [] - - foreach(dep, fidl_deps) { - gen_dir = get_label_info(dep, "target_gen_dir") - name = get_label_info(dep, "name") - dep_libraries += [ "$gen_dir/$name.libraries" ] - } - - inputs = dep_libraries - - args += [ "--dep-libraries" ] + rebase_path(dep_libraries, root_build_dir) - } - } - - executable_action(compilation_target_name) { - forward_variables_from(invoker, [ "testonly" ]) - - visibility = [ ":*" ] - - tool = "$fuchsia_tool_dir/fidlc" - - inputs = [ response_file ] - - outputs = [ - coding_tables, - json_representation, - ] - - args = [ "@" + rebase_path(response_file, root_build_dir) ] - - deps = [ ":$response_file_target_name" ] + non_fidl_deps - } - - group(main_target_name) { - forward_variables_from(invoker, - [ - "testonly", - "visibility", - "response_file", - ]) - - # Metadata to allow us to query all FIDL IR files. - metadata = { - fidl_json = [ rebase_path(json_representation, root_build_dir) ] - generated_sources = fidl_json - } - - public_deps = [ - ":$compilation_target_name", - ":$response_file_target_name", - ] - } -} diff --git a/tools/fuchsia/fidl/gen_response_file.py b/tools/fuchsia/fidl/gen_response_file.py deleted file mode 100755 index 309e6f2343304..0000000000000 --- a/tools/fuchsia/fidl/gen_response_file.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import argparse -from pathlib import Path - - -def main(): - parser = argparse.ArgumentParser( - description="Generate response file for FIDL frontend. " - "Arguments not mentioned here are forwarded as is to fidlc." - ) - parser.add_argument( - "--out-response-file", - help="The path for for the response file to generate", - type=Path, - required=True - ) - parser.add_argument( - "--out-libraries", - help="The path for for the libraries file to generate", - type=Path, - required=True - ) - parser.add_argument("--sources", help="List of FIDL source files", nargs="+", required=True) - parser.add_argument("--dep-libraries", help="List of dependent libraries", nargs="*") - args, args_to_forward = parser.parse_known_args() - - # Each line contains a library's source files separated by spaces. - # We use a dict instead of a set to maintain insertion order. - dep_lines = {} - for path in args.dep_libraries or []: - with open(path) as f: - for line in f: - dep_lines[line.rstrip()] = True - libraries = list(dep_lines) - libraries.append(" ".join(sorted(args.sources))) - - args.out_libraries.parent.mkdir(parents=True, exist_ok=True) - with open(args.out_libraries, "w") as f: - print("\n".join(libraries), file=f) - - args.out_response_file.parent.mkdir(parents=True, exist_ok=True) - with open(args.out_response_file, "w") as f: - fidlc_args = args_to_forward + ["--files " + line for line in libraries] - print(" ".join(fidlc_args), file=f) - - -if __name__ == "__main__": - main() diff --git a/tools/fuchsia/fidl/toolchain.gni b/tools/fuchsia/fidl/toolchain.gni deleted file mode 100644 index 503c5b668894f..0000000000000 --- a/tools/fuchsia/fidl/toolchain.gni +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -fidl_toolchain = "//flutter/tools/fuchsia/fidl:fidling" diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni index 24a87fed7749d..481d59346cdd4 100644 --- a/tools/fuchsia/sdk/sdk_targets.gni +++ b/tools/fuchsia/sdk/sdk_targets.gni @@ -3,8 +3,7 @@ # found in the LICENSE file. import("//flutter/tools/fuchsia/dart/dart_library.gni") -import("//flutter/tools/fuchsia/fidl/fidl.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +import("//flutter/tools/fuchsia/gn-sdk/src/fidl_library.gni") template("_fuchsia_dart_library") { assert(defined(invoker.meta), "The meta file content must be specified.") @@ -73,23 +72,6 @@ template("_fuchsia_dart_library") { } } -template("_fuchsia_fidl_library") { - assert(defined(invoker.meta), "The meta file content must be specified.") - meta = invoker.meta - assert(meta.type == "fidl_library") - - fidl(target_name) { - sources = [] - foreach(source, meta.sources) { - sources += [ "$fuchsia_sdk/$source" ] - } - public_deps = [] - foreach(dep, meta.deps) { - public_deps += [ ":$dep" ] - } - } -} - template("sdk_targets") { assert(defined(invoker.meta), "The meta.json file path must be specified.") @@ -121,7 +103,7 @@ template("sdk_targets") { meta = part_meta_json } } else if (target_type == "fidl_library") { - _fuchsia_fidl_library(subtarget_name) { + fidl_library(subtarget_name) { meta = part_meta_json } } diff --git a/tools/gn b/tools/gn index bb8756e277d33..375af5d707939 100755 --- a/tools/gn +++ b/tools/gn @@ -754,7 +754,6 @@ def to_gn_args(args): if args.target_os == 'fuchsia': gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni' - gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk' if args.fuchsia_target_api_level is not None: gn_args['fuchsia_target_api_level'] = args.fuchsia_target_api_level elif args.target_os == 'fuchsia': From 114b9b547b62ab1fc902bcf83f9b1a7abe92bee0 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 15:23:24 -0800 Subject: [PATCH 17/40] missing changes --- shell/platform/fuchsia/flutter/BUILD.gn | 4 ++-- .../fuchsia/flutter/tests/fakes/BUILD.gn | 6 ++++-- .../fuchsia/flutter/tests/fakes/scenic/BUILD.gn | 16 +++++++++------- skia/BUILD.gn | 10 +++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index c47561cb43bd0..ad9af916b4e9f 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -524,8 +524,8 @@ if (enable_unittests) { "tests/fakes", ":flutter_runner_fixtures", ":flutter_runner_sources", - "//build/fuchsia/pkg:async-testing", - "//build/fuchsia/pkg:sys_cpp_testing", + "${fuchsia_sdk}/pkg/async-testing", + "${fuchsia_sdk}/pkg/sys_cpp_testing", "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs", "//flutter/testing", ] + flutter_deps diff --git a/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn b/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn index 4b23cd9632286..e47a8d3cbcec8 100644 --- a/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/fakes/BUILD.gn @@ -4,6 +4,8 @@ assert(is_fuchsia) +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + group("fakes") { testonly = true @@ -25,7 +27,7 @@ source_set("focus") { ] deps = [ - "//build/fuchsia/pkg:sys_cpp_testing", + "${fuchsia_sdk}/pkg/sys_cpp_testing", "//flutter/lib/ui", "//flutter/testing", "//flutter/third_party/rapidjson", @@ -38,7 +40,7 @@ source_set("pointer") { sources = [ "mock_injector_registry.h" ] deps = [ - "//build/fuchsia/pkg:sys_cpp_testing", + "${fuchsia_sdk}/pkg/sys_cpp_testing", "//flutter/lib/ui", "//flutter/testing", "//flutter/third_party/rapidjson", diff --git a/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn b/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn index 4ca6cf029086f..d8ac33b6b0522 100644 --- a/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/fakes/scenic/BUILD.gn @@ -4,6 +4,8 @@ assert(is_fuchsia) +import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + source_set("scenic") { testonly = true @@ -15,13 +17,13 @@ source_set("scenic") { ] public_deps = [ - "//build/fuchsia/fidl:fuchsia.images", - "//build/fuchsia/fidl:fuchsia.scenic.scheduling", - "//build/fuchsia/fidl:fuchsia.ui.composition", - "//build/fuchsia/fidl:fuchsia.ui.views", - "//build/fuchsia/pkg:async-cpp", - "//build/fuchsia/pkg:async-testing", - "//build/fuchsia/pkg:fidl_cpp", + "${fuchsia_sdk}/fidl/fuchsia.images", + "${fuchsia_sdk}/fidl/fuchsia.scenic.scheduling", + "${fuchsia_sdk}/fidl/fuchsia.ui.composition", + "${fuchsia_sdk}/fidl/fuchsia.ui.views", + "${fuchsia_sdk}/pkg/async-cpp", + "${fuchsia_sdk}/pkg/async-testing", + "${fuchsia_sdk}/pkg/fidl_cpp", "//flutter/fml", ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 7ed4830ce9259..30bdfd6d215ae 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -288,8 +288,8 @@ optional("fontmgr_fuchsia") { deps = [] - if (is_fuchsia && using_fuchsia_sdk) { - deps += [ "//build/fuchsia/fidl:fuchsia.fonts" ] + if (is_fuchsia) { + deps += [ "${fuchsia_sdk}/fidl/fuchsia.fonts" ] } else { deps = [ "//sdk/fidl/fuchsia.fonts" ] } @@ -459,11 +459,7 @@ optional("gpu") { public += skia_gpu_vk_public sources += skia_gpu_vk_private if (is_fuchsia) { - if (using_fuchsia_sdk) { - public_deps += [ "${fuchsia_sdk}/pkg/vulkan" ] - } else { - public_deps += [ "$_skia_root/src/graphics/lib/vulkan" ] - } + public_deps += [ "${fuchsia_sdk}/pkg/vulkan" ] } if (is_android) { sources += skia_gpu_vk_android_private From 42cb2f2590f6a4aa7f0c2be8d07678a2ff161c23 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 15:48:43 -0800 Subject: [PATCH 18/40] deps --- fml/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fml/BUILD.gn b/fml/BUILD.gn index b1d9185a81780..8065f59cb9587 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -226,9 +226,12 @@ source_set("fml") { "platform/fuchsia/task_observers.h", ] - public_deps += [ + deps += [ "${fuchsia_sdk}/fidl/fuchsia.diagnostics", "${fuchsia_sdk}/fidl/fuchsia.logger", + ] + + public_deps += [ "${fuchsia_sdk}/pkg/async-cpp", "${fuchsia_sdk}/pkg/async-loop-cpp", "${fuchsia_sdk}/pkg/async-loop-default", From e84717476233e63a3f6b0355411bf3e69180826f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 7 Mar 2024 16:25:08 -0800 Subject: [PATCH 19/40] deps --- fml/BUILD.gn | 7 ++----- shell/platform/fuchsia/dart_runner/BUILD.gn | 4 ++-- shell/platform/fuchsia/flutter/BUILD.gn | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 8065f59cb9587..afcec3936adce 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -226,12 +226,9 @@ source_set("fml") { "platform/fuchsia/task_observers.h", ] - deps += [ - "${fuchsia_sdk}/fidl/fuchsia.diagnostics", - "${fuchsia_sdk}/fidl/fuchsia.logger", - ] - public_deps += [ + "${fuchsia_sdk}/fidl/fuchsia.diagnostics:fuchsia.diagnostics_cpp", + "${fuchsia_sdk}/fidl/fuchsia.logger:fuchsia.logger_cpp", "${fuchsia_sdk}/pkg/async-cpp", "${fuchsia_sdk}/pkg/async-loop-cpp", "${fuchsia_sdk}/pkg/async-loop-default", diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 607c3de1fef03..4dac8a9d8b0d5 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -43,14 +43,14 @@ template("runner_sources") { } public_deps = [ + "${fuchsia_sdk}/fidl/fuchsia.component.runner", + "${fuchsia_sdk}/fidl/fuchsia.test", "${fuchsia_sdk}/pkg/sys_cpp", "//flutter/fml", ] + dart_public_deps deps = [ - "${fuchsia_sdk}/fidl/fuchsia.component.runner", "${fuchsia_sdk}/fidl/fuchsia.logger", - "${fuchsia_sdk}/fidl/fuchsia.test", "${fuchsia_sdk}/pkg/async", "${fuchsia_sdk}/pkg/async-cpp", "${fuchsia_sdk}/pkg/async-default", diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index ad9af916b4e9f..7361e17ddb257 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -139,6 +139,8 @@ template("runner_sources") { ] public_deps = [ + "${fuchsia_sdk}/fidl/fuchsia.component.runner", + "${fuchsia_sdk}/fidl/fuchsia.ui.app", "${fuchsia_sdk}/pkg/inspect", "${fuchsia_sdk}/pkg/inspect_component_cpp", "${fuchsia_sdk}/pkg/sys_cpp", @@ -147,14 +149,12 @@ template("runner_sources") { deps = [ "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", - "${fuchsia_sdk}/fidl/fuchsia.component.runner", "${fuchsia_sdk}/fidl/fuchsia.fonts", "${fuchsia_sdk}/fidl/fuchsia.images", "${fuchsia_sdk}/fidl/fuchsia.intl", "${fuchsia_sdk}/fidl/fuchsia.io", "${fuchsia_sdk}/fidl/fuchsia.media", "${fuchsia_sdk}/fidl/fuchsia.memorypressure", - "${fuchsia_sdk}/fidl/fuchsia.ui.app", "${fuchsia_sdk}/fidl/fuchsia.ui.composition", "${fuchsia_sdk}/fidl/fuchsia.ui.input", "${fuchsia_sdk}/fidl/fuchsia.ui.input3", From 1c86d9b3f7b09fe14caab7769abce7afc17eba2c Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Fri, 8 Mar 2024 10:35:23 -0800 Subject: [PATCH 20/40] remove unnecessary gn_configs --- build/config/fuchsia/gn_configs.gni | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 38e624b62a9e2..186ee7a2ee1e3 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -56,19 +56,6 @@ declare_args() { } } -# Copy from third_party/fuchsia-gn-sdk/src/gn_configs.gni to avoid importing -# files from //third_party/ in //build/. -if (current_cpu != "") { - # According to - # https://gn.googlesource.com/gn/+/main/docs/cross_compiles.md#as-a-build_gn-author, - # current_cpu is preferred. - fuchsia_arch_root = current_cpu -} else { - fuchsia_arch_root = target_cpu -} -fuchsia_arch_root = - "${fuchsia_sdk}/obj/${fuchsia_arch_root}-api-${fuchsia_target_api_level}" - # third_party/googletest is still using this condition. using_fuchsia_sdk = true From 52b314b93d91bcb0b119da2ced33a12c89c7548e Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Fri, 8 Mar 2024 14:27:00 -0800 Subject: [PATCH 21/40] gn-sdk --- tools/gn | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/gn b/tools/gn index 1b39ea7e2fce0..a6df196bd2c70 100755 --- a/tools/gn +++ b/tools/gn @@ -769,7 +769,6 @@ def to_gn_args(args): if args.target_os == 'fuchsia': gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni' - gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk' if args.fuchsia_target_api_level is not None: gn_args['fuchsia_target_api_level'] = args.fuchsia_target_api_level elif args.target_os == 'fuchsia': From e6216a5e4989351cf1ba475038382fcd2aeeda0f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 13:40:55 -0700 Subject: [PATCH 22/40] compile --- shell/platform/fuchsia/flutter/BUILD.gn | 31 ++++++++++--------- .../flutter/tests/integration/utils/BUILD.gn | 1 + 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index 7361e17ddb257..ad4e3426a1c80 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -138,9 +138,26 @@ template("runner_sources") { "//flutter/vulkan/procs", ] + # TODO(zijiehe): Considering which deps should belong to the public_deps, + # multiple dependencies of this target use the following deps without + # explicitly claiming the dependencies. public_deps = [ + "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", "${fuchsia_sdk}/fidl/fuchsia.component.runner", + "${fuchsia_sdk}/fidl/fuchsia.fonts", + "${fuchsia_sdk}/fidl/fuchsia.images", + "${fuchsia_sdk}/fidl/fuchsia.intl", + "${fuchsia_sdk}/fidl/fuchsia.io", + "${fuchsia_sdk}/fidl/fuchsia.media", + "${fuchsia_sdk}/fidl/fuchsia.memorypressure", "${fuchsia_sdk}/fidl/fuchsia.ui.app", + "${fuchsia_sdk}/fidl/fuchsia.ui.composition", + "${fuchsia_sdk}/fidl/fuchsia.ui.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.input3", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointer", + "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", + "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", + "${fuchsia_sdk}/fidl/fuchsia.ui.views", "${fuchsia_sdk}/pkg/inspect", "${fuchsia_sdk}/pkg/inspect_component_cpp", "${fuchsia_sdk}/pkg/sys_cpp", @@ -148,20 +165,6 @@ template("runner_sources") { ] + flutter_public_deps deps = [ - "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", - "${fuchsia_sdk}/fidl/fuchsia.fonts", - "${fuchsia_sdk}/fidl/fuchsia.images", - "${fuchsia_sdk}/fidl/fuchsia.intl", - "${fuchsia_sdk}/fidl/fuchsia.io", - "${fuchsia_sdk}/fidl/fuchsia.media", - "${fuchsia_sdk}/fidl/fuchsia.memorypressure", - "${fuchsia_sdk}/fidl/fuchsia.ui.composition", - "${fuchsia_sdk}/fidl/fuchsia.ui.input", - "${fuchsia_sdk}/fidl/fuchsia.ui.input3", - "${fuchsia_sdk}/fidl/fuchsia.ui.pointer", - "${fuchsia_sdk}/fidl/fuchsia.ui.pointerinjector", - "${fuchsia_sdk}/fidl/fuchsia.ui.test.input", - "${fuchsia_sdk}/fidl/fuchsia.ui.views", "${fuchsia_sdk}/pkg/async-cpp", "${fuchsia_sdk}/pkg/async-default", "${fuchsia_sdk}/pkg/async-loop", diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn index f00966cb5f75d..613976f2056a5 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn @@ -43,6 +43,7 @@ source_set("portable_ui_test") { ":check_view", "${fuchsia_sdk}/fidl/fuchsia.inspect", "${fuchsia_sdk}/fidl/fuchsia.logger", + "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", "${fuchsia_sdk}/fidl/fuchsia.ui.app", "${fuchsia_sdk}/fidl/fuchsia.ui.composition", "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", From 69c6dd98ac4f0c6b597e1341eb65d1d5fb202fdf Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 15:53:05 -0700 Subject: [PATCH 23/40] _cpp --- DEPS | 2 +- build/config/fuchsia/gn_configs.gni | 3 --- ci/licenses_golden/licenses_dart | 6 +++++- .../fuchsia/flutter/tests/integration/text-input/BUILD.gn | 2 ++ sky/packages/sky_engine/LICENSE | 2 +- tools/gn | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 94695f26eab0d..4abe8887952e0 100644 --- a/DEPS +++ b/DEPS @@ -62,7 +62,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '09a1a1ede1c41bf0ee81b63ce0c48b2b055b3f51', + 'dart_revision': 'df116cff5505661ed893f0630a6c01e8966f883a', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 186ee7a2ee1e3..e5a4da6414687 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -58,6 +58,3 @@ declare_args() { # third_party/googletest is still using this condition. using_fuchsia_sdk = true - -# Override the default fuchsia_gn_sdk in dart. -fuchsia_gn_sdk = "//flutter/fuchsia/tools/gn-sdk" diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart index 3e8a0df9727bd..45ee951b6c5f1 100644 --- a/ci/licenses_golden/licenses_dart +++ b/ci/licenses_golden/licenses_dart @@ -1,4 +1,8 @@ +<<<<<<< HEAD Signature: 24c0cd5003c769f09aa729a6de0f2890 +======= +Signature: 438e308336c1c60e290c59dd465e2139 +>>>>>>> 12ff28feff (run) ==================================================================================================== LIBRARY: dart @@ -4747,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/09a1a1ede1c41bf0ee81b63ce0c48b2b055b3f51 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/df116cff5505661ed893f0630a6c01e8966f883a /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index c918b5a4a5cd3..41346b91046c2 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -25,8 +25,10 @@ executable("text-input-test-bin") { deps = [ "${fuchsia_sdk}/fidl/fuchsia.accessibility.semantics", "${fuchsia_sdk}/fidl/fuchsia.component", + "${fuchsia_sdk}/fidl/fuchsia.feedback", "${fuchsia_sdk}/fidl/fuchsia.intl", "${fuchsia_sdk}/fidl/fuchsia.kernel", + "${fuchsia_sdk}/fidl/fuchsia.logger", "${fuchsia_sdk}/fidl/fuchsia.tracing.provider", "${fuchsia_sdk}/fidl/fuchsia.ui.app", "${fuchsia_sdk}/fidl/fuchsia.ui.display.singleton", diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 9b930b1d96307..9ef93630dadbf 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -31736,7 +31736,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/09a1a1ede1c41bf0ee81b63ce0c48b2b055b3f51 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/df116cff5505661ed893f0630a6c01e8966f883a /third_party/fallback_root_certificates/ -------------------------------------------------------------------------------- diff --git a/tools/gn b/tools/gn index a6df196bd2c70..1b39ea7e2fce0 100755 --- a/tools/gn +++ b/tools/gn @@ -769,6 +769,7 @@ def to_gn_args(args): if args.target_os == 'fuchsia': gn_args['gn_configs_path'] = '//flutter/build/config/fuchsia/gn_configs.gni' + gn_args['fuchsia_gn_sdk'] = '//flutter/tools/fuchsia/gn-sdk' if args.fuchsia_target_api_level is not None: gn_args['fuchsia_target_api_level'] = args.fuchsia_target_api_level elif args.target_os == 'fuchsia': From 332fd6aeae2fdfdc43a69a57ac1cd98b32f9edd9 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 15:56:01 -0700 Subject: [PATCH 24/40] merge --- ci/licenses_golden/licenses_dart | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart index 45ee951b6c5f1..732653ab25981 100644 --- a/ci/licenses_golden/licenses_dart +++ b/ci/licenses_golden/licenses_dart @@ -1,8 +1,4 @@ -<<<<<<< HEAD -Signature: 24c0cd5003c769f09aa729a6de0f2890 -======= Signature: 438e308336c1c60e290c59dd465e2139 ->>>>>>> 12ff28feff (run) ==================================================================================================== LIBRARY: dart From 20cea5d732eef1d60f3ea9d1a013569c1355433a Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 16:06:18 -0700 Subject: [PATCH 25/40] condition --- third_party/libjpeg-turbo/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index ad5ba02258ef1..d6bef4c58eee1 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -8,7 +8,9 @@ if (current_cpu == "arm") { import("//build/config/arm.gni") } -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} if ((current_cpu == "x86" || current_cpu == "x64") && is_fuchsia && !using_fuchsia_sdk) { From b0de6a532018a976ef61edec5c680c278d56f67d Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 16:11:15 -0700 Subject: [PATCH 26/40] deps --- shell/platform/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/BUILD.gn b/shell/platform/BUILD.gn index 3ccab57f00fd8..63e9901643614 100644 --- a/shell/platform/BUILD.gn +++ b/shell/platform/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//flutter/shell/platform/config.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") group("platform") { if (is_mac || is_ios) { @@ -21,6 +20,7 @@ group("platform") { deps += [ "windows" ] } } else if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") deps = [ "fuchsia" ] } else { assert(false, "Unknown/Unsupported platform.") From 94d9b2603d0ddbd578b780af04e1ad477e966582 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Mon, 11 Mar 2024 16:16:43 -0700 Subject: [PATCH 27/40] condition --- display_list/BUILD.gn | 5 ++++- flow/BUILD.gn | 5 ++++- fml/BUILD.gn | 5 ++++- lib/snapshot/BUILD.gn | 5 ++++- lib/ui/BUILD.gn | 5 ++++- shell/common/BUILD.gn | 5 ++++- shell/testing/BUILD.gn | 5 ++++- sky/packages/sky_engine/BUILD.gn | 5 +++-- third_party/txt/BUILD.gn | 5 ++++- vulkan/BUILD.gn | 4 +++- 10 files changed, 38 insertions(+), 11 deletions(-) diff --git a/display_list/BUILD.gn b/display_list/BUILD.gn index a676ab3c5d889..1de81acf01a4b 100644 --- a/display_list/BUILD.gn +++ b/display_list/BUILD.gn @@ -5,7 +5,10 @@ import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/testing/testing.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} config("display_list_config") { defines = [] diff --git a/flow/BUILD.gn b/flow/BUILD.gn index 5e1c3df225348..4a1aade9b5f75 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -6,7 +6,10 @@ import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") import("//flutter/testing/testing.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} source_set("flow") { sources = [ diff --git a/fml/BUILD.gn b/fml/BUILD.gn index afcec3936adce..9e60ba9f8d9f0 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -4,7 +4,10 @@ import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} source_set("fml") { sources = [ diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 99ed8c6b7b439..270dc680f60c7 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -7,9 +7,12 @@ import("//flutter/build/bin_to_obj.gni") import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/lib/ui/dart_ui.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("$dart_src/utils/compile_platform.gni") +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} + # Generates the Dart/Flutter core platform files and tools. # # This target generates the platform-specific snapshots and snapshot-related diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 7ebaf94dea692..1d00f1dfeba50 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -6,7 +6,10 @@ import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/config.gni") import("//flutter/testing/testing.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} source_set("ui") { cflags = [ diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index 483aafb5e03b1..8e2d9f2174b3a 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -6,7 +6,10 @@ import("//flutter/common/config.gni") import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") import("//flutter/testing/testing.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} # Template to generate a dart embedder resource.cc file. # Required invoker inputs: diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn index 378566036a520..28a19c75d1bb9 100644 --- a/shell/testing/BUILD.gn +++ b/shell/testing/BUILD.gn @@ -4,7 +4,10 @@ import("//flutter/impeller/tools/impeller.gni") import("//flutter/shell/gpu/gpu.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") + +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} shell_gpu_configuration("tester_gpu_configuration") { enable_software = true diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index 47f5a913cf7ae..bcef489889342 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -4,7 +4,6 @@ import("//flutter/build/dart/rules.gni") import("//flutter/lib/ui/dart_ui.gni") -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/web_sdk/web_sdk.gni") import("$dart_src/sdk/lib/_http/http_sources.gni") import("$dart_src/sdk/lib/_internal/js_runtime/interceptors_sources.gni") @@ -28,7 +27,9 @@ import("$dart_src/sdk/lib/js_util/js_util_sources.gni") import("$dart_src/sdk/lib/math/math_sources.gni") import("$dart_src/sdk/lib/typed_data/typed_data_sources.gni") -if (!is_fuchsia) { +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} else { copy("copy_sky_engine_authors") { sources = [ "//AUTHORS" ] diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index 703a0eba41c4a..9079ed1585300 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -12,10 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") import("//flutter/common/config.gni") import("//flutter/testing/testing.gni") +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} + declare_args() { flutter_use_fontconfig = false } diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn index 4b41ced9137ec..8dce31a7684dc 100644 --- a/vulkan/BUILD.gn +++ b/vulkan/BUILD.gn @@ -2,7 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +if (is_fuchsia) { + import("//flutter/tools/fuchsia/gn-sdk/src/gn_configs.gni") +} source_set("vulkan") { sources = [ From 56f6fa2bcf97f350417bfbd4246eef78fe7e4b34 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 09:49:24 -0700 Subject: [PATCH 28/40] update license --- ci/licenses_golden/excluded_files | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index cf422f0f6441d..eb6b6d3758612 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -330,7 +330,6 @@ ../../../flutter/shell/platform/fuchsia/dart_runner/.gitignore ../../../flutter/shell/platform/fuchsia/dart_runner/README.md ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/pubspec.yaml -../../../flutter/shell/platform/fuchsia/dart_runner/fidl/meta.json ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.yaml ../../../flutter/shell/platform/fuchsia/dart_runner/tests From 2c21e92e7d37ac9e106f26530d6bd28b632a7e8a Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 09:52:15 -0700 Subject: [PATCH 29/40] condition --- DEPS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEPS b/DEPS index 6f8ac53f50335..d948dbbcf66f0 100644 --- a/DEPS +++ b/DEPS @@ -1024,6 +1024,7 @@ deps = { 'version': Var('fuchsia_test_scripts_version'), } ], + 'condition': 'run_fuchsia_emu', 'dep_type': 'cipd', }, @@ -1242,6 +1243,7 @@ hooks = [ { 'name': 'Generate Fuchsia GN build rules', 'pattern': '.', + 'condition': 'run_fuchsia_emu', 'action': [ 'python3', 'src/flutter/tools/fuchsia/with_envs.py', From 91c338920e9150b1bc708b17b547b63920250c7d Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 10:18:23 -0700 Subject: [PATCH 30/40] support os --- DEPS | 2 -- tools/fuchsia/with_envs.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/DEPS b/DEPS index d948dbbcf66f0..6f8ac53f50335 100644 --- a/DEPS +++ b/DEPS @@ -1024,7 +1024,6 @@ deps = { 'version': Var('fuchsia_test_scripts_version'), } ], - 'condition': 'run_fuchsia_emu', 'dep_type': 'cipd', }, @@ -1243,7 +1242,6 @@ hooks = [ { 'name': 'Generate Fuchsia GN build rules', 'pattern': '.', - 'condition': 'run_fuchsia_emu', 'action': [ 'python3', 'src/flutter/tools/fuchsia/with_envs.py', diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index bb23636a419c9..af28e36c47df4 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -27,7 +27,7 @@ def Main(): # third_party/, so images root and sdk root need to be explicitly set. os.environ['FUCHSIA_IMAGES_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/images/') - assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() + assert platform.system() in ['Linux', 'Darwin'], 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join( os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src' From bb7801afa16035b2572f0907af0d39cf0928a800 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 10:20:02 -0700 Subject: [PATCH 31/40] condition --- DEPS | 3 +++ tools/fuchsia/with_envs.py | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 6f8ac53f50335..681eb9dc1d427 100644 --- a/DEPS +++ b/DEPS @@ -1024,6 +1024,7 @@ deps = { 'version': Var('fuchsia_test_scripts_version'), } ], + 'condition': 'host_os == "linux"', 'dep_type': 'cipd', }, @@ -1034,6 +1035,7 @@ deps = { 'version': Var('fuchsia_gn_sdk_version'), } ], + 'condition': 'host_os == "linux"', 'dep_type': 'cipd', }, @@ -1242,6 +1244,7 @@ hooks = [ { 'name': 'Generate Fuchsia GN build rules', 'pattern': '.', + 'condition': 'host_os == "linux"', 'action': [ 'python3', 'src/flutter/tools/fuchsia/with_envs.py', diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index af28e36c47df4..73f3ace1a4d4a 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -27,11 +27,8 @@ def Main(): # third_party/, so images root and sdk root need to be explicitly set. os.environ['FUCHSIA_IMAGES_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/images/') - assert platform.system() in ['Linux', 'Darwin'], 'Unsupported OS ' + platform.system() + assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') - os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join( - os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src' - ) if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True': sdk_path = os.environ['FUCHSIA_SDK_PATH'] From fe0df9c44444b1cba92540c1f622b9d3e86ba193 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 11:18:12 -0700 Subject: [PATCH 32/40] gn --- tools/fuchsia/with_envs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index 73f3ace1a4d4a..6ca6d444b57f9 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,6 +29,7 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/gn-sdk/src') if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True': sdk_path = os.environ['FUCHSIA_SDK_PATH'] From e4d0b17cc079491df315097d7601eee04311af86 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 11:28:15 -0700 Subject: [PATCH 33/40] wrong location --- tools/fuchsia/with_envs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index 6ca6d444b57f9..b9e06bec7d72c 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,7 +29,7 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') - os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/gn-sdk/src') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src') if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True': sdk_path = os.environ['FUCHSIA_SDK_PATH'] From 9e928f6766eb1709541c2aea430cb19877e55758 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 11:28:34 -0700 Subject: [PATCH 34/40] format --- tools/fuchsia/with_envs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/fuchsia/with_envs.py b/tools/fuchsia/with_envs.py index b9e06bec7d72c..bb23636a419c9 100644 --- a/tools/fuchsia/with_envs.py +++ b/tools/fuchsia/with_envs.py @@ -29,7 +29,9 @@ def Main(): assert platform.system() == 'Linux', 'Unsupported OS ' + platform.system() os.environ['FUCHSIA_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'fuchsia/sdk/linux/') - os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src') + os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join( + os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src' + ) if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True': sdk_path = os.environ['FUCHSIA_SDK_PATH'] From 7aa1ac18f16018d3158364adcd36a3a5bb92f027 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 13 Mar 2024 14:45:09 -0700 Subject: [PATCH 35/40] download_fuchsia_deps --- DEPS | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 681eb9dc1d427..1196b37ab9716 100644 --- a/DEPS +++ b/DEPS @@ -107,6 +107,12 @@ vars = { # //flutter/tools/gn. 'mac_sdk_min': '10.14', + # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which + # controls the behavior of all fuchsia related flags. I.e. any fuchsia related + # logic or condition may not work if this flag is False. + # TODO(zijiehe): Make this condition more strict to only download fuchsia + # dependencies when necessary: b/40935282 + 'download_fuchsia_deps': 'host_os == "linux"', # Downloads the fuchsia SDK as listed in fuchsia_sdk_path var. This variable # is currently only used for the Fuchsia LSC process and is not intended for # local development. @@ -1013,7 +1019,7 @@ deps = { 'version': 'L6_XzizcJqjneCvGA941vq-Dpu0FPwhdyfqJ0qXDUG0C' } ], - 'condition': 'host_os == "linux" and not download_fuchsia_sdk', + 'condition': 'download_fuchsia_deps and not download_fuchsia_sdk', 'dep_type': 'cipd', }, @@ -1024,7 +1030,7 @@ deps = { 'version': Var('fuchsia_test_scripts_version'), } ], - 'condition': 'host_os == "linux"', + 'condition': 'download_fuchsia_deps', 'dep_type': 'cipd', }, @@ -1035,7 +1041,7 @@ deps = { 'version': Var('fuchsia_gn_sdk_version'), } ], - 'condition': 'host_os == "linux"', + 'condition': 'download_fuchsia_deps', 'dep_type': 'cipd', }, @@ -1129,7 +1135,7 @@ hooks = [ { 'name': 'Download Fuchsia SDK', 'pattern': '.', - 'condition': 'download_fuchsia_sdk', + 'condition': 'download_fuchsia_deps and download_fuchsia_sdk', 'action': [ 'python3', 'src/flutter/tools/download_fuchsia_sdk.py', @@ -1244,7 +1250,7 @@ hooks = [ { 'name': 'Generate Fuchsia GN build rules', 'pattern': '.', - 'condition': 'host_os == "linux"', + 'condition': 'download_fuchsia_deps', 'action': [ 'python3', 'src/flutter/tools/fuchsia/with_envs.py', From d321a759e5b8cad5d89ac2e8791a6319177544fa Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 14 Mar 2024 18:46:53 -0700 Subject: [PATCH 36/40] update dart --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 1196b37ab9716..9e20083232829 100644 --- a/DEPS +++ b/DEPS @@ -62,7 +62,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': 'df116cff5505661ed893f0630a6c01e8966f883a', + 'dart_revision': '406955fe69503eb11fb16a8405534a979f5eef60', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py From a03541e62457b1796e9bffcdf56847f3e2b51c7d Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 14 Mar 2024 18:53:23 -0700 Subject: [PATCH 37/40] merge --- DEPS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DEPS b/DEPS index 4d90149868cbb..68c6dcbf12d90 100644 --- a/DEPS +++ b/DEPS @@ -398,11 +398,7 @@ deps = { Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415', 'src/third_party/dart/third_party/pkg/dartdoc': -<<<<<<< HEAD - Var('dart_git') + '/dartdoc.git@0de8aff3d2feb6fb9fb5ecf5e4f699b3a0ef2c63', -======= Var('dart_git') + '/dartdoc.git@89a3b4ae0b89c4e540fb00f27a61f0652ada6314', ->>>>>>> upstream/main 'src/third_party/dart/third_party/pkg/file': Var('dart_git') + '/external/github.com/google/file.dart@3aa06490bf34bddf04c7ea964a50c177a4ca0de7', From 3b9d2a817cfd4cbf90d947457a6df7429b00e0ca Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 14 Mar 2024 18:55:33 -0700 Subject: [PATCH 38/40] license --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 89511c0d45801..89e6ae151857c 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 10ea95d73c5e8a92240f014b15634a8c +Signature: b0fbe71c20bdf5b2a1c163281b1f90de From f0ffbbc2f948876ff03eb2b1910f9010bc6c8e5a Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 14 Mar 2024 19:11:00 -0700 Subject: [PATCH 39/40] licenses --- ci/licenses_golden/licenses_dart | 4 ++-- sky/packages/sky_engine/LICENSE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart index f23d9590ae762..d404104eecb2d 100644 --- a/ci/licenses_golden/licenses_dart +++ b/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: c01d057033e277986624c640f663a410 +Signature: 6dada66d64680541f83bc84b71ddf2bb ==================================================================================================== LIBRARY: dart @@ -4751,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/df116cff5505661ed893f0630a6c01e8966f883a +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/406955fe69503eb11fb16a8405534a979f5eef60 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 546a8700b6a7d..000defbd5cdeb 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -31736,7 +31736,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/d006b668dcb252171d743526e2a2f3ba34f0c48e +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/406955fe69503eb11fb16a8405534a979f5eef60 /third_party/fallback_root_certificates/ -------------------------------------------------------------------------------- From b733e37f644cc4598333d012dc5ae83c55caaae4 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Thu, 14 Mar 2024 19:12:08 -0700 Subject: [PATCH 40/40] unexpected change --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 89e6ae151857c..89511c0d45801 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: b0fbe71c20bdf5b2a1c163281b1f90de +Signature: 10ea95d73c5e8a92240f014b15634a8c