Skip to content

Commit

Permalink
Version 3.4.0-213.0.dev
Browse files Browse the repository at this point in the history
Merge 8de00e2 into dev
  • Loading branch information
Dart CI committed Mar 8, 2024
2 parents 4c64fcc + 8de00e2 commit 799b1fb
Show file tree
Hide file tree
Showing 52 changed files with 1,175 additions and 788 deletions.
24 changes: 22 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ Var("dart_root") + "/third_party/pkg/tar":
"packages": [
{
"package": "chromium/fuchsia/test-scripts",
"version": "version:2@49064713a73ae92d8c28164938b97869afd336aa",
"version": "EAdD2YcYwVrhF2q_zR6xUvPkcKlPb1tJyM_6_oOc84kC",
}
],
"condition": 'download_fuchsia_deps',
Expand All @@ -711,7 +711,7 @@ Var("dart_root") + "/third_party/pkg/tar":
"packages": [
{
"package": "chromium/fuchsia/gn-sdk",
"version": "version:2@7f1f23fce153ca079a77492d9d47d803d60b774e",
"version": "RgErspyYHapUO2SpcW-vo2p8yaRUMUrq0eWjRVPfQjoC",
}
],
"condition": 'download_fuchsia_deps',
Expand Down Expand Up @@ -836,6 +836,16 @@ hooks = [
Var('emsdk_ver')],
'condition': 'download_emscripten'
},
{
'name': 'Erase arch/ from fuchsia sdk',
'pattern': '.',
'action': [
'rm',
'-rf',
'sdk/third_party/fuchsia/sdk/linux/arch',
],
'condition': 'download_fuchsia_deps'
},
{
'name': 'Download Fuchsia system images',
'pattern': '.',
Expand All @@ -847,4 +857,14 @@ hooks = [
],
'condition': 'download_fuchsia_deps'
},
{
'name': 'Generate Fuchsia GN build rules',
'pattern': '.',
'action': [
'python3',
'sdk/build/fuchsia/with_envs.py',
'sdk/third_party/fuchsia/test_scripts/gen_build_defs.py',
],
'condition': 'download_fuchsia_deps'
},
]
10 changes: 4 additions & 6 deletions build/config/BUILDCONFIG.gn
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,7 @@ if (is_win) {
"//build/config/win:winver",
]
if (is_clang) {
_native_compiler_configs += [
"//build/config/win:relative_paths",
]
_native_compiler_configs += [ "//build/config/win:relative_paths" ]
}
}
if (is_posix) {
Expand All @@ -270,8 +268,8 @@ if (is_posix) {
}
if (is_fuchsia) {
_native_compiler_configs += [
"//build/config/fuchsia:compiler",
"//build/config/fuchsia:runtime_library",
"//third_party/fuchsia/gn-sdk/src/config:compiler",
"//third_party/fuchsia/gn-sdk/src/config:runtime_library",
]
}

Expand Down Expand Up @@ -450,8 +448,8 @@ foreach(_target_type,
}
if (is_fuchsia) {
deps += [
"//build/config/fuchsia:runtime_library_group",
"//build/fuchsia/config/clang:c++-runtime-deps",
"//third_party/fuchsia/gn-sdk/src/config:runtime_library_group",
]
}
}
Expand Down
89 changes: 0 additions & 89 deletions build/config/fuchsia/BUILD.gn

This file was deleted.

11 changes: 0 additions & 11 deletions build/fuchsia/fidl/BUILD.gn

This file was deleted.

99 changes: 0 additions & 99 deletions build/fuchsia/fidl_gen_cpp.py

This file was deleted.

14 changes: 0 additions & 14 deletions build/fuchsia/pkg/BUILD.gn

This file was deleted.

Loading

0 comments on commit 799b1fb

Please sign in to comment.