diff --git a/build/config/fuchsia/gn_configs.gni b/build/config/fuchsia/gn_configs.gni index 7cf672c278640..ff981de991ccf 100644 --- a/build/config/fuchsia/gn_configs.gni +++ b/build/config/fuchsia/gn_configs.gni @@ -21,12 +21,6 @@ declare_args() { # TODO(zijiehe): Remove the override and move it into declare_args once the one # in //build/config/sdk.gni being removed. - b/40935282 -# 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 = 22 - # 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. diff --git a/tools/fuchsia/build_fuchsia_artifacts.py b/tools/fuchsia/build_fuchsia_artifacts.py index 3e25325308ad4..5258466145387 100755 --- a/tools/fuchsia/build_fuchsia_artifacts.py +++ b/tools/fuchsia/build_fuchsia_artifacts.py @@ -178,12 +178,13 @@ def CopyToBucket(src, dst, product=False): def ReadTargetAPILevel(): - filename = os.path.join(os.path.dirname(__file__), '../../build/config/fuchsia/gn_configs.gni') + filename = os.path.join(os.path.dirname(__file__), 'gn-sdk/src/gn_configs.gni') with open(filename) as f: for line in f: + line = line.strip() if line.startswith('fuchsia_target_api_level'): return line.split('=')[-1].strip() - assert False, 'No fuchsia_target_api_level found in //flutter/build/config/fuchsia/gn_configs.gni' + assert False, 'No fuchsia_target_api_level found in ' + filename def CopyVulkanDepsToBucket(src, dst, arch): diff --git a/tools/fuchsia/build_fuchsia_artifacts_test.py b/tools/fuchsia/build_fuchsia_artifacts_test.py index 9c536a6d15306..3ad93f21c66e9 100755 --- a/tools/fuchsia/build_fuchsia_artifacts_test.py +++ b/tools/fuchsia/build_fuchsia_artifacts_test.py @@ -8,10 +8,7 @@ class BuildFuchsiaArtifactsTest(unittest.TestCase): def test_read_fuchsia_target_api_level(self): - # It's expected to update this test each time the fuchsia_target_api_level - # in //flutter/build/config/fuchsia/gn_configs.gni is changed, so we don't - # accidentally publish the artifacts with an incorrect api level suffix. - self.assertEqual(build_fuchsia_artifacts.ReadTargetAPILevel(), '22') + self.assertGreater(int(build_fuchsia_artifacts.ReadTargetAPILevel()), 21) if __name__ == '__main__':