Skip to content

Commit 476ed37

Browse files
zijiehe-google-comCommit Queue
authored and
Commit Queue
committed
Reland "[Fuchsia] Remove the legacy gn build rules for fuchsia"
This change may require a codereview from flutter side before moving forward. See flutter/engine#51072. This reverts commit 283051a. Reason for revert: Redo the change with the similar one in flutter. After this change, the next dart -> flutter roll needs extra cares in flutter/engine#51072. It also contains more details about the reason why it could not be two-way compatible. Original change's description: > Revert "[Fuchsia] Remove the legacy gn build rules for fuchsia" > > This reverts commit 094202b. > > Reason for revert: Break flutter, this change should happen after > flutter being migrated to the same gn-sdk. > > Original change's description: > > [Fuchsia] Remove the legacy gn build rules for fuchsia > > > > The updated test-scripts contains https://crrev.com/c/5341620 which > > allows to generate fidl apis with an env var controlled location > > rather than a hard-coded one. So the existing fuchsia gn build rules > > in dart/sdk become obsolete and can be fully removed in favor of the > > one in //third_party/fuchsia/gn-sdk/. > > > > Meanwhile the gn-sdk has been updated with > > https://crrev.com/c/5325282 to use api-level version'ed idk but not > > the ones in arch/. > > > > Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-arm64-try,vm-fuchsia-release-x64-try > > Tested: ^^^^^ > > Bug: 40935282 > > Change-Id: I2ce958e6db1ff8221beef7b7ff953c32bb4525ba > > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355283 > > Reviewed-by: Ryan Macnak <[email protected]> > > Reviewed-by: Alexander Thomas <[email protected]> > > Commit-Queue: Zijie He <[email protected]> > > Bug: 40935282 > Change-Id: I7c455d1d362210523671c97d99ef018ede1743f4 > Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-arm64-try,vm-fuchsia-release-x64-try > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/356307 > Bot-Commit: Rubber Stamper <[email protected]> > Auto-Submit: Zijie He <[email protected]> > Reviewed-by: Derek Xu <[email protected]> > Commit-Queue: Zijie He <[email protected]> Bug: 40935282 Change-Id: Id5a9a98013350359037b19f8506f24158c9a3120 Cq-Include-Trybots: luci.dart.try:vm-fuchsia-release-arm64-try,vm-fuchsia-release-x64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/356924 Commit-Queue: Zijie He <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent 70acceb commit 476ed37

File tree

14 files changed

+82
-770
lines changed

14 files changed

+82
-770
lines changed

DEPS

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ Var("dart_root") + "/third_party/pkg/tar":
700700
"packages": [
701701
{
702702
"package": "chromium/fuchsia/test-scripts",
703-
"version": "version:2@49064713a73ae92d8c28164938b97869afd336aa",
703+
"version": "EAdD2YcYwVrhF2q_zR6xUvPkcKlPb1tJyM_6_oOc84kC",
704704
}
705705
],
706706
"condition": 'download_fuchsia_deps',
@@ -711,7 +711,7 @@ Var("dart_root") + "/third_party/pkg/tar":
711711
"packages": [
712712
{
713713
"package": "chromium/fuchsia/gn-sdk",
714-
"version": "version:2@7f1f23fce153ca079a77492d9d47d803d60b774e",
714+
"version": "RgErspyYHapUO2SpcW-vo2p8yaRUMUrq0eWjRVPfQjoC",
715715
}
716716
],
717717
"condition": 'download_fuchsia_deps',
@@ -836,6 +836,16 @@ hooks = [
836836
Var('emsdk_ver')],
837837
'condition': 'download_emscripten'
838838
},
839+
{
840+
'name': 'Erase arch/ from fuchsia sdk',
841+
'pattern': '.',
842+
'action': [
843+
'rm',
844+
'-rf',
845+
'sdk/third_party/fuchsia/sdk/linux/arch',
846+
],
847+
'condition': 'download_fuchsia_deps'
848+
},
839849
{
840850
'name': 'Download Fuchsia system images',
841851
'pattern': '.',
@@ -847,4 +857,14 @@ hooks = [
847857
],
848858
'condition': 'download_fuchsia_deps'
849859
},
860+
{
861+
'name': 'Generate Fuchsia GN build rules',
862+
'pattern': '.',
863+
'action': [
864+
'python3',
865+
'sdk/build/fuchsia/with_envs.py',
866+
'sdk/third_party/fuchsia/test_scripts/gen_build_defs.py',
867+
],
868+
'condition': 'download_fuchsia_deps'
869+
},
850870
]

build/config/BUILDCONFIG.gn

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,7 @@ if (is_win) {
257257
"//build/config/win:winver",
258258
]
259259
if (is_clang) {
260-
_native_compiler_configs += [
261-
"//build/config/win:relative_paths",
262-
]
260+
_native_compiler_configs += [ "//build/config/win:relative_paths" ]
263261
}
264262
}
265263
if (is_posix) {
@@ -270,8 +268,8 @@ if (is_posix) {
270268
}
271269
if (is_fuchsia) {
272270
_native_compiler_configs += [
273-
"//build/config/fuchsia:compiler",
274-
"//build/config/fuchsia:runtime_library",
271+
"//third_party/fuchsia/gn-sdk/src/config:compiler",
272+
"//third_party/fuchsia/gn-sdk/src/config:runtime_library",
275273
]
276274
}
277275

@@ -450,8 +448,8 @@ foreach(_target_type,
450448
}
451449
if (is_fuchsia) {
452450
deps += [
453-
"//build/config/fuchsia:runtime_library_group",
454451
"//build/fuchsia/config/clang:c++-runtime-deps",
452+
"//third_party/fuchsia/gn-sdk/src/config:runtime_library_group",
455453
]
456454
}
457455
}

build/config/fuchsia/BUILD.gn

Lines changed: 0 additions & 89 deletions
This file was deleted.

build/fuchsia/fidl/BUILD.gn

Lines changed: 0 additions & 11 deletions
This file was deleted.

build/fuchsia/fidl_gen_cpp.py

Lines changed: 0 additions & 99 deletions
This file was deleted.

build/fuchsia/pkg/BUILD.gn

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)