Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 8364a11

Browse files
[fuchsia] Remove duplicate gn_configs (#54855)
Change https://crrev.com/c/5823950 moved most of the gn_configs to fuchsia-gn-sdk, and they are not needed to be repeated again in the gn_configs.gni anymore Bug: [359657446](http://crbug.com/359657446) ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 3075094 commit 8364a11

File tree

1 file changed

+3
-32
lines changed

1 file changed

+3
-32
lines changed

build/config/fuchsia/gn_configs.gni

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,9 @@
66
# https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni
77
# with some local modifications to match the flutter setup.
88

9-
declare_args() {
10-
# Path to the fuchsia SDK. This is intended for use in other templates &
11-
# rules to reference the contents of the fuchsia SDK.
12-
fuchsia_sdk = "//fuchsia/sdk/$host_os"
13-
14-
# ID uniquely identifying the Fuchsia IDK build. This is exposed as a
15-
# property so it can be used to locate images and packages on GCS and
16-
# as a marker to indicate the "version" of the IDK.
17-
# Defaults to the id found in the manifest.json file of the SDK.
18-
fuchsia_sdk_id = ""
19-
}
20-
21-
# TODO(zijiehe): Remove the override and move it into declare_args once the one
22-
# in //build/config/sdk.gni being removed. - b/40935282
23-
24-
# The SDK manifest file. This is useful to include as a dependency
25-
# for some targets in order to cause a rebuild when the version of the
26-
# SDK is changed.
27-
fuchsia_sdk_manifest_file = "${fuchsia_sdk}/meta/manifest.json"
28-
29-
# fuchsia_tool_dir is used to specify the directory in the SDK to locate
30-
# tools for the host cpu architecture. If the host_cpu is not recognized,
31-
# then tool dir defaults to x64.
32-
fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}"
33-
34-
if (fuchsia_sdk_id == "") {
35-
# Note: If we need to expose more than just the id in the future,
36-
# we should consider exposing the entire json object for the metadata vs.
37-
# adding a bunch of variables.
38-
_meta = read_file(fuchsia_sdk_manifest_file, "json")
39-
fuchsia_sdk_id = _meta.id
40-
}
9+
# Path to the fuchsia SDK. This is intended for use in other templates &
10+
# rules to reference the contents of the fuchsia SDK.
11+
fuchsia_sdk = "//fuchsia/sdk/$host_os"
4112

4213
declare_args() {
4314
# Specify a readelf_exec path to use. If not specified, the host's system

0 commit comments

Comments
 (0)