[Fuchsia] Use shared gn-sdk from chromium

.gitignore

@@ -139,3 +139,6 @@ app.*.symbols
 
 # The test-scripts from Chromium and managed by DEPS and gclient.
 /tools/fuchsia/test_scripts
+
+# The gn-sdk from Chromium and managed by DEPS and gclient.
+/tools/fuchsia/gn-sdk

DEPS

@@ -254,6 +254,10 @@ vars = {
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
   'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC',
+
+  # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
+  # used altogether with fuchsia-sdk to generate gn based build rules.
+  'fuchsia_gn_sdk_version': 'l8zShEOXGGjtLYRulEX5CjT2RemKvUPOT6L-uXy41tMC',
 }
 
 gclient_gn_args_file = 'src/third_party/dart/build/config/gclient_args.gni'
@@ -1020,6 +1024,16 @@ deps = {
      'dep_type': 'cipd',
    },
 
+  'src/flutter/tools/fuchsia/gn-sdk': {
+     'packages': [
+       {
+        'package': 'chromium/fuchsia/gn-sdk',
+        'version': Var('fuchsia_gn_sdk_version'),
+       }
+     ],
+     'dep_type': 'cipd',
+   },
+
   'src/third_party/impeller-cmake-example': {
      'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'c44e8093972c969acf171be72591e408a85fdc53',
      'condition': 'download_impeller_cmake_example',

tools/fuchsia/gn-sdk/config/config.gni → build/config/fuchsia/gn_configs.gni

@@ -53,3 +53,14 @@ if (fuchsia_sdk_id == "") {
   _meta = read_file(fuchsia_sdk_manifest_file, "json")
   fuchsia_sdk_id = _meta.id
 }
+
+declare_args() {
+  # Specify a readelf_exec path to use. If not specified, the host's system
+  # executable will be used. Passed to populate_build_id_dir.py and
+  # prepare_package_inputs.py via the --readelf-exec flag.
+  # Must be a GN path (not an absolute path) since it is adjusted with
+  # rebase_path().
+  if (!defined(fuchsia_sdk_readelf_exec)) {
+    fuchsia_sdk_readelf_exec = ""
+  }
+}

shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/fuchsia/sdk.gni")
 import("//flutter/testing/testing.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 config("zircon_config") {
   include_dirs = [ "." ]

shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml

@@ -4,7 +4,7 @@
 
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/fuchsia/sdk.gni")
 
 import("//flutter/tools/fuchsia/dart/dart_component.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   testonly = true

shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml

@@ -4,7 +4,7 @@
 
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "child-view"

shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn

@@ -5,7 +5,7 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "parent-view"

shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn

@@ -6,7 +6,7 @@ assert(is_fuchsia)
 
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true

shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn

@@ -5,8 +5,8 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "mouse-input-view"

shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn

@@ -6,7 +6,7 @@ assert(is_fuchsia)
 
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true

shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn

@@ -5,8 +5,8 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   testonly = true

shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn

@@ -6,7 +6,7 @@ assert(is_fuchsia)
 
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 group("tests") {
   testonly = true

shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn

@@ -5,8 +5,8 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "embedding-flutter-view"

shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 {
     include: [
-        "gtest_runner.shard.cml",
+        "sys/testing/gtest_runner.shard.cml",
         "sys/component/realm_builder_absolute.shard.cml",
 
         // This test needs both the vulkan facet and the hermetic-tier-2 facet,

shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn

@@ -5,8 +5,8 @@
 import("//build/fuchsia/sdk.gni")
 import("//flutter/tools/fuchsia/dart/dart_library.gni")
 import("//flutter/tools/fuchsia/flutter/flutter_component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
-import("//flutter/tools/fuchsia/gn-sdk/package.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/package.gni")
 
 dart_library("lib") {
   package_name = "touch-input-view"

tools/fuchsia/fidl/fidl_library.gni

@@ -5,7 +5,9 @@
 import("//flutter/tools/executable_action.gni")
 import("//flutter/tools/fuchsia/fidl/fidl.gni")
 import("//flutter/tools/fuchsia/fidl/toolchain.gni")
-import("//flutter/tools/fuchsia/gn-sdk/config/config.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/config/config.gni")
+
+# TODO(zijiehe): May use fidl_library in gn-sdk if possible. - http://crbug.com/40935282
 
 # Generates some representation of a FIDL library that's consumable by Language
 # bindings generators.

tools/fuchsia/flutter/internal/flutter_dart_component.gni

@@ -7,8 +7,8 @@ import("//flutter/tools/fuchsia/dart/config.gni")
 import("//flutter/tools/fuchsia/dart/dart.gni")
 import("//flutter/tools/fuchsia/dart/dart_package_config.gni")
 import("//flutter/tools/fuchsia/dart/kernel/dart_kernel.gni")
-import("//flutter/tools/fuchsia/gn-sdk/cmc.gni")
-import("//flutter/tools/fuchsia/gn-sdk/component.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/cmc.gni")
+import("//flutter/tools/fuchsia/gn-sdk/src/component.gni")
 
 # Defines a component which will run in a flutter_runner or dart_runner
 #