Allow the project to be mapped to a location other than //flutter. (#4203)

This is for Fuchsia where we would like it to be located at //third_party/flutter.

BUILD.gn

@@ -6,56 +6,62 @@ group("flutter") {
   testonly = true
 
   deps = [
-    "//flutter/lib/snapshot:compile_platform",
-    "//flutter/lib/snapshot:generate_snapshot_bin",
-    "//flutter/sky",
-    "//flutter/third_party/txt",
+    "$flutter_root/lib/snapshot:compile_platform",
+    "$flutter_root/lib/snapshot:generate_snapshot_bin",
+    "$flutter_root/sky",
+    "$flutter_root/third_party/txt",
   ]
 
   if (!is_fuchsia) {
     if (current_toolchain == host_toolchain) {
       deps += [
         "//dart:create_sdk",
-        "//flutter/frontend_server",
+        "$flutter_root/frontend_server",
       ]
     }
   }
 
   if (is_fuchsia) {
     deps += [
-      "//flutter/content_handler",
-      "//flutter/content_handler:aot_content_handler",
-      "//flutter/examples",
-      "//flutter/flow",
+      "$flutter_root/content_handler",
+      "$flutter_root/content_handler:aot_content_handler",
+      "$flutter_root/examples",
+      "$flutter_root/flow",
     ]
   }
 
   # If on the host, compile all unittests targets.
   if (current_toolchain == host_toolchain) {
     if (is_mac) {
-      deps += [ "//flutter/shell/platform/darwin:flutter_channels_unittests" ]
+      deps += [ "$flutter_root/shell/platform/darwin:flutter_channels_unittests" ]
     }
     if (!is_win) {
-      deps += [ "//flutter/shell/platform/embedder:flutter_engine" ]
+      deps += [ "$flutter_root/shell/platform/embedder:flutter_engine" ]
     }
     deps += [
-      "//flutter/flow:flow_unittests",
-      "//flutter/fml:fml_unittests",
-      "//flutter/sky/engine/wtf:wtf_unittests",
-      "//flutter/synchronization:synchronization_unittests",
-      "//flutter/third_party/txt:txt_benchmarks",
-      "//flutter/third_party/txt:txt_unittests",
+      "$flutter_root/flow:flow_unittests",
+      "$flutter_root/fml:fml_unittests",
+      "$flutter_root/sky/engine/wtf:wtf_unittests",
+      "$flutter_root/synchronization:synchronization_unittests",
+      "$flutter_root/third_party/txt:txt_benchmarks",
+      "$flutter_root/third_party/txt:txt_unittests",
       "//garnet/public/lib/fxl:fxl_unittests",
     ]
   }
 }
 
+config("config") {
+  include_dirs = [
+    "..",
+  ]
+}
+
 if (!is_fuchsia) {
   group("dist") {
     testonly = true
 
     deps = [
-      "//flutter/sky/dist",
+      "$flutter_root/sky/dist",
     ]
   }
 }

assets/BUILD.gn

@@ -13,7 +13,7 @@ source_set("assets") {
   ]
 
   deps = [
-    "//flutter/glue",
+    "$flutter_root/glue",
     "//garnet/public/lib/fxl",
     "//garnet/public/lib/zip",
   ]
@@ -21,4 +21,8 @@ source_set("assets") {
   public_deps = [
     "//third_party/zlib:minizip",
   ]
+
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }

build/dart/rules.gni

@@ -44,7 +44,7 @@ template("dart_pkg_helper") {
       sdk_ext_mappings += invoker.sdk_ext_mappings
     }
 
-    script = rebase_path("flutter/build/dart/tools/dart_pkg.py", ".", "//")
+    script = rebase_path("$flutter_root/build/dart/tools/dart_pkg.py", ".", "//")
 
     entrypoints = []
     if (defined(invoker.apps)) {
@@ -61,7 +61,7 @@ template("dart_pkg_helper") {
     if (defined(invoker.sources)) {
       sources += invoker.sources
     } else if (defined(invoker.pkg_dir)) {
-      list_script = rebase_path("flutter/build/dart/tools/ls.py", ".", "//")
+      list_script = rebase_path("$flutter_root/build/dart/tools/ls.py", ".", "//")
       extra_flags += [ "--read_only" ]
       ls_sources = exec_script(list_script,
                                [
@@ -112,7 +112,7 @@ template("dart_pkg") {
     pubspec_yaml_path = rebase_path("pubspec.yaml")
   }
   dart_package_name_script =
-      rebase_path("flutter/build/dart/tools/dart_package_name.py", ".", "//")
+      rebase_path("$flutter_root/build/dart/tools/dart_package_name.py", ".", "//")
   dart_package_name = exec_script(dart_package_name_script,
                                   [
                                     "--pubspec",

build/flutter_app.gni

@@ -5,7 +5,7 @@
 assert(is_fuchsia)
 
 import("//build/dart/dart_package.gni")
-import("//flutter/lib/ui/dart_ui.gni")
+import("$flutter_root/lib/ui/dart_ui.gni")
 import("//topaz/public/dart-pkg/fuchsia/sdk_ext.gni")
 import("//topaz/public/dart-pkg/zircon/sdk_ext.gni")
 import("//topaz/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
@@ -18,9 +18,9 @@ gen_snapshot_label = "//dart/runtime/bin:gen_snapshot($host_toolchain)"
 gen_snapshot_dir = get_label_info(gen_snapshot_label, "root_out_dir")
 gen_snapshot = "$gen_snapshot_dir/gen_snapshot"
 
-flutter_root = "//lib/flutter"
+flutter_base = "//lib/flutter"
 flutter_tools_label =
-    "$flutter_root/packages/flutter_tools:fuchsia_builder($host_toolchain)"
+    "$flutter_base/packages/flutter_tools:fuchsia_builder($host_toolchain)"
 flutter_tools_out_dir = get_label_info(flutter_tools_label, "root_out_dir")
 flutter_tools_bin = "$flutter_tools_out_dir/dart-tools/fuchsia_builder"
 
@@ -50,7 +50,7 @@ template("flutter_jit_app") {
     bundle_name = "${target_name}.flx"
   }
 
-  flutter_core_snapshot_label = "//flutter/lib/snapshot:generate_snapshot_bin"
+  flutter_core_snapshot_label = "$flutter_root/lib/snapshot:generate_snapshot_bin"
   flutter_core_snapshot_gen_dir =
       get_label_info(flutter_core_snapshot_label, "target_gen_dir")
   flutter_core_snapshot_vm_data =
@@ -91,7 +91,7 @@ template("flutter_jit_app") {
       sources = invoker.sources
     }
 
-    script = "//flutter/build/script_snapshot.py"
+    script = "$flutter_root/build/script_snapshot.py"
 
     args = [
       "--snapshotter-path",
@@ -144,11 +144,11 @@ template("flutter_jit_app") {
       bundle_path,
     ]
 
-    script = "//flutter/build/package.py"
+    script = "$flutter_root/build/package.py"
 
     args = [
       "--flutter-root",
-      rebase_path(flutter_root),
+      rebase_path(flutter_base),
       "--flutter-tools",
       rebase_path(flutter_tools_bin),
       "--working-dir",
@@ -225,8 +225,8 @@ template("flutter_aot_app") {
              mozart_dart_sdk_ext_files +
              [
                main_dart,
-               "//flutter/runtime/dart_vm_entry_points.txt",
-               "//flutter/runtime/dart_vm_entry_points_fuchsia.txt",
+               "$flutter_root/runtime/dart_vm_entry_points.txt",
+               "$flutter_root/runtime/dart_vm_entry_points_fuchsia.txt",
                "//dart/runtime/bin/dart_io_entries.txt",
              ]
 
@@ -238,7 +238,7 @@ template("flutter_aot_app") {
       sources = invoker.sources
     }
 
-    script = "//flutter/build/aot_snapshot.py"
+    script = "$flutter_root/build/aot_snapshot.py"
     args = [
       "--snapshotter-path",
       rebase_path(gen_snapshot),
@@ -262,9 +262,9 @@ template("flutter_aot_app") {
               "$root_gen_dir/dart-pkg/sky_engine/sdk_ext/vmservice_io.dart"),
 
       "--entry-points-manifest",
-      rebase_path("//flutter/runtime/dart_vm_entry_points.txt"),
+      rebase_path("$flutter_root/runtime/dart_vm_entry_points.txt"),
       "--entry-points-manifest",
-      rebase_path("//flutter/runtime/dart_vm_entry_points_fuchsia.txt"),
+      rebase_path("$flutter_root/runtime/dart_vm_entry_points_fuchsia.txt"),
       "--entry-points-manifest",
       rebase_path("//dart/runtime/bin/dart_io_entries.txt"),
 
@@ -279,7 +279,7 @@ template("flutter_aot_app") {
 
     deps = [
       ":$dart_package_name",
-      "//flutter/lib/snapshot:generate_dart_ui",
+      "$flutter_root/lib/snapshot:generate_dart_ui",
       gen_snapshot_label,
     ]
 
@@ -323,11 +323,11 @@ template("flutter_aot_app") {
       bundle_path,
     ]
 
-    script = "//flutter/build/package.py"
+    script = "$flutter_root/build/package.py"
 
     args = [
       "--flutter-root",
-      rebase_path(flutter_root),
+      rebase_path(flutter_base),
       "--flutter-tools",
       rebase_path(flutter_tools_bin),
       "--working-dir",

common/BUILD.gn

@@ -20,5 +20,8 @@ source_set("common") {
     "//garnet/public/lib/fxl",
   ]
 
-  public_configs = [ ":flutter_config" ]
+  public_configs = [
+    ":flutter_config",
+    "$flutter_root:config",
+  ]
 }

content_handler/BUILD.gn

@@ -46,14 +46,14 @@ template("flutter_content_handler") {
     deps = [
              "//dart/runtime/bin:libdart_builtin",
              "//dart/runtime/platform:libdart_platform",
-             "//flutter/assets",
-             "//flutter/common",
-             "//flutter/flow",
-             "//flutter/glue",
-             "//flutter/lib/ui",
-             "//flutter/runtime",
-             "//flutter/sky/engine/platform",
-             "//flutter/vulkan",
+             "$flutter_root/assets",
+             "$flutter_root/common",
+             "$flutter_root/flow",
+             "$flutter_root/glue",
+             "$flutter_root/lib/ui",
+             "$flutter_root/runtime",
+             "$flutter_root/sky/engine/platform",
+             "$flutter_root/vulkan",
              "//garnet/public/lib/app/cpp",
              "//garnet/public/lib/fsl",
              "//garnet/public/lib/fxl",

examples/hello_flutter/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/build/flutter_app.gni")
+import("$flutter_root/build/flutter_app.gni")
 
 flutter_jit_app("hello_flutter") {
   main_dart = "lib/main.dart"

examples/spinning_square/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/build/flutter_app.gni")
+import("$flutter_root/build/flutter_app.gni")
 
 flutter_app("spinning_square") {
   main_dart = "lib/main.dart"

flow/BUILD.gn

@@ -57,10 +57,14 @@ source_set("flow") {
     "//garnet/public/lib/fxl",
   ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   deps = [
-    "//flutter/common",
-    "//flutter/glue",
-    "//flutter/synchronization",
+    "$flutter_root/common",
+    "$flutter_root/glue",
+    "$flutter_root/synchronization",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
@@ -96,7 +100,7 @@ executable("flow_unittests") {
   deps = [
     ":flow",
     "//dart/runtime:libdart_jit",  # for tracing
-    "//flutter/testing",
+    "$flutter_root/testing",
     "//third_party/skia",
   ]
 }

fml/BUILD.gn

@@ -33,6 +33,10 @@ source_set("fml") {
 
   configs += [ "//third_party/icu:icu_config" ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   libs = []
 
   if (is_ios || is_mac) {
@@ -111,8 +115,8 @@ executable("fml_unittests") {
 
   deps = [
     "//dart/runtime:libdart_jit",
-    "//flutter/fml",
-    "//flutter/testing",
+    "$flutter_root/fml",
+    "$flutter_root/testing",
     "//garnet/public/lib/fxl",
   ]
 }

glue/BUILD.gn

@@ -12,6 +12,10 @@ source_set("glue") {
     "//garnet/public/lib/fxl",
   ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   if (is_fuchsia) {
     sources += [ "stack_trace_fuchsia.cc" ]
 
@@ -21,6 +25,6 @@ source_set("glue") {
   } else {
     sources += [ "stack_trace_base.cc" ]
 
-    deps += [ "//flutter/fml" ]
+    deps += [ "$flutter_root/fml" ]
   }
 }

lib/io/BUILD.gn

@@ -18,4 +18,8 @@ source_set("io") {
   configs += [
     "//dart/runtime:dart_config",
   ]
+
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }

lib/snapshot/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/lib/ui/dart_ui.gni")
+import("$flutter_root/lib/ui/dart_ui.gni")
 
 import("//dart/runtime/bin/io_sources.gni")
 import("//dart/runtime/lib/async_sources.gni")

lib/ui/BUILD.gn

@@ -85,15 +85,19 @@ source_set("ui") {
     "window/window.h",
   ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   deps = [
     "//dart/runtime/bin:embedded_dart_io",
-    "//flutter/assets",
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/glue",
-    "//flutter/runtime:test_font",
-    "//flutter/sky/engine",
-    "//flutter/third_party/txt",
+    "$flutter_root/assets",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/glue",
+    "$flutter_root/runtime:test_font",
+    "$flutter_root/sky/engine",
+    "$flutter_root/third_party/txt",
     "//third_party/rapidjson",
     "//third_party/skia",
     "//third_party/skia:gpu",

lib/ui/dart_ui.gni

@@ -3,18 +3,18 @@
 # found in the LICENSE file.
 
 dart_ui_files = [
-  "//flutter/lib/ui/compositing.dart",
-  "//flutter/lib/ui/geometry.dart",
-  "//flutter/lib/ui/hash_codes.dart",
-  "//flutter/lib/ui/hooks.dart",
-  "//flutter/lib/ui/lerp.dart",
-  "//flutter/lib/ui/natives.dart",
-  "//flutter/lib/ui/painting.dart",
-  "//flutter/lib/ui/pointer.dart",
-  "//flutter/lib/ui/semantics.dart",
-  "//flutter/lib/ui/text.dart",
-  "//flutter/lib/ui/ui.dart",
-  "//flutter/lib/ui/window.dart",
+  "$flutter_root/lib/ui/compositing.dart",
+  "$flutter_root/lib/ui/geometry.dart",
+  "$flutter_root/lib/ui/hash_codes.dart",
+  "$flutter_root/lib/ui/hooks.dart",
+  "$flutter_root/lib/ui/lerp.dart",
+  "$flutter_root/lib/ui/natives.dart",
+  "$flutter_root/lib/ui/painting.dart",
+  "$flutter_root/lib/ui/pointer.dart",
+  "$flutter_root/lib/ui/semantics.dart",
+  "$flutter_root/lib/ui/text.dart",
+  "$flutter_root/lib/ui/ui.dart",
+  "$flutter_root/lib/ui/window.dart",
 ]
 
-dart_ui_path = "//flutter/lib/ui/ui.dart"
+dart_ui_path = "$flutter_root/lib/ui/ui.dart"

runtime/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//dart/runtime/bin/vmservice/vmservice_sources.gni")
-import("//flutter/common/config.gni")
+import("$flutter_root/common/config.gni")
 
 action("gen_embedded_resources_cc") {
   script = "//dart/runtime/tools/create_resources.py"
@@ -37,6 +37,9 @@ source_set("embedded_resources_cc") {
   deps = [
     ":gen_embedded_resources_cc",
   ]
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }
 
 source_set("test_font") {
@@ -47,6 +50,9 @@ source_set("test_font") {
   deps = [
     "//third_party/skia",
   ]
+  public_configs = [
+    "$flutter_root:config",
+  ]
   defines = []
   if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) {
     # Though the test font data is small, we dont want to add to the binary size
@@ -88,24 +94,28 @@ source_set("runtime") {
     ":test_font",
     "//dart/runtime:dart_api",
     "//dart/runtime/bin:embedded_dart_io",
-    "//flutter/assets",
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/glue",
-    "//flutter/lib/io",
-    "//flutter/lib/ui",
-    "//flutter/sky/engine/platform",
-    "//flutter/third_party/txt",
+    "$flutter_root/assets",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/glue",
+    "$flutter_root/lib/io",
+    "$flutter_root/lib/ui",
+    "$flutter_root/sky/engine/platform",
+    "$flutter_root/third_party/txt",
     "//garnet/public/lib/fxl",
     "//third_party/rapidjson",
     "//third_party/skia",
     "//topaz/lib/tonic",
   ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   # In AOT mode, precompiled snapshots contain the instruction buffer.
   # Generation of the same requires all application specific script code to be
   # specified up front. In such cases, there can be no generic snapshot.
   if (!flutter_aot) {
-    deps += [ "//flutter/lib/snapshot" ]
+    deps += [ "$flutter_root/lib/snapshot" ]
   }
 }

shell/common/BUILD.gn

@@ -57,9 +57,9 @@ template("dart_embedder_resources") {
 
 dart_embedder_resources("generate_embedder_diagnostic_server_resources_cc") {
   inputs = [
-    "//flutter/shell/common/diagnostic/diagnostic_server.dart",
+    "$flutter_root/shell/common/diagnostic/diagnostic_server.dart",
   ]
-  root_prefix = "//flutter/shell/common/diagnostic/"
+  root_prefix = "$flutter_root/shell/common/diagnostic/"
   output = "$target_gen_dir/embedder_diagnostic_server_resources.cc"
   table_name = "sky_embedder_diagnostic_server"
 }
@@ -103,16 +103,16 @@ source_set("common") {
     ":generate_embedder_diagnostic_server_resources_cc",
     "//dart/runtime:dart_api",
     "//dart/runtime/platform:libdart_platform",
-    "//flutter/assets",
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/fml",
-    "//flutter/glue",
-    "//flutter/lib/ui",
-    "//flutter/runtime",
-    "//flutter/sky/engine/wtf",
-    "//flutter/synchronization",
-    "//flutter/third_party/txt",
+    "$flutter_root/assets",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/fml",
+    "$flutter_root/glue",
+    "$flutter_root/lib/ui",
+    "$flutter_root/runtime",
+    "$flutter_root/sky/engine/wtf",
+    "$flutter_root/synchronization",
+    "$flutter_root/third_party/txt",
     "//garnet/public/lib/fxl",
     "//third_party/rapidjson",
     "//third_party/skia",
@@ -122,4 +122,8 @@ source_set("common") {
   public_deps = [
     "//topaz/lib/tonic",
   ]
+
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }

shell/gpu/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/shell/config.gni")
+import("$flutter_root/shell/config.gni")
 
 source_set("gpu") {
   sources = [
@@ -22,17 +22,21 @@ source_set("gpu") {
   }
 
   deps = [
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/glue",
-    "//flutter/shell/common",
-    "//flutter/synchronization",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/glue",
+    "$flutter_root/shell/common",
+    "$flutter_root/synchronization",
     "//garnet/public/lib/fxl",
     "//third_party/skia",
     "//third_party/skia:gpu",
   ]
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   if (shell_enable_vulkan) {
-    deps += [ "//flutter/vulkan" ]
+    deps += [ "$flutter_root/vulkan" ]
   }
 }

shell/platform/android/BUILD.gn

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/common/config.gni")
-import("//flutter/shell/config.gni")
+import("$flutter_root/common/config.gni")
+import("$flutter_root/shell/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
@@ -37,13 +37,13 @@ shared_library("flutter_shell_native") {
   ]
 
   deps = [
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/fml",
-    "//flutter/lib/ui",
-    "//flutter/runtime",
-    "//flutter/shell/common",
-    "//flutter/shell/gpu",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/fml",
+    "$flutter_root/lib/ui",
+    "$flutter_root/runtime",
+    "$flutter_root/shell/common",
+    "$flutter_root/shell/gpu",
     "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
@@ -53,6 +53,10 @@ shared_library("flutter_shell_native") {
     deps += [ "//dart/runtime:libdart_precompiled_runtime" ]
   }
 
+  public_configs = [
+    "$flutter_root:config",
+  ]
+
   defines = []
 
   if (shell_enable_vulkan) {
@@ -61,7 +65,7 @@ shared_library("flutter_shell_native") {
       "android_surface_vulkan.h",
     ]
 
-    deps += [ "//flutter/vulkan" ]
+    deps += [ "$flutter_root/vulkan" ]
 
     defines += [ "SHELL_ENABLE_VULKAN" ]
   }

shell/platform/darwin/BUILD.gn

@@ -39,17 +39,21 @@ source_set("flutter_channels") {
   set_sources_assignment_filter(sources_assignment_filter)
 
   deps = [
-    "//flutter/common",
-    "//flutter/flow",
-    "//flutter/fml",
-    "//flutter/runtime",
-    "//flutter/shell/common",
-    "//flutter/shell/gpu",
-    "//flutter/shell/testing",
-    "//flutter/sky/engine/wtf",
+    "$flutter_root/common",
+    "$flutter_root/flow",
+    "$flutter_root/fml",
+    "$flutter_root/runtime",
+    "$flutter_root/shell/common",
+    "$flutter_root/shell/gpu",
+    "$flutter_root/shell/testing",
+    "$flutter_root/sky/engine/wtf",
     "//garnet/public/lib/fxl",
     "//third_party/skia",
   ]
+
+  public_configs = [
+    "$flutter_root:config",
+  ]
 }
 
 executable("flutter_channels_unittests") {
@@ -65,6 +69,6 @@ executable("flutter_channels_unittests") {
   deps = [
     ":flutter_channels",
     "//dart/runtime:libdart_jit",
-    "//flutter/testing",
+    "$flutter_root/testing",
   ]
 }