From be83f077edc0b6cdf42d942007a14b2009dddcd0 Mon Sep 17 00:00:00 2001
From: "zijiehe@" <68449066+zijiehe-google-com@users.noreply.github.com>
Date: Thu, 29 Aug 2024 13:12:03 -0700
Subject: [PATCH] [fuchsia] Remove duplicate gn_configs (flutter/engine#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
---
 .../build/config/fuchsia/gn_configs.gni       | 35 ++-----------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/engine/src/flutter/build/config/fuchsia/gn_configs.gni b/engine/src/flutter/build/config/fuchsia/gn_configs.gni
index ff981de991c..5f8bf8bbbdf 100644
--- a/engine/src/flutter/build/config/fuchsia/gn_configs.gni
+++ b/engine/src/flutter/build/config/fuchsia/gn_configs.gni
@@ -6,38 +6,9 @@
 # https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni
 # with some local modifications to match the flutter setup.
 
-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"
-
-  # 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 = ""
-}
-
-# TODO(zijiehe): Remove the override and move it into declare_args once the one
-# in //build/config/sdk.gni being removed. - b/40935282
-
-# 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,
-  # we should consider exposing the entire json object for the metadata vs.
-  # adding a bunch of variables.
-  _meta = read_file(fuchsia_sdk_manifest_file, "json")
-  fuchsia_sdk_id = _meta.id
-}
+# 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"
 
 declare_args() {
   # Specify a readelf_exec path to use. If not specified, the host's system