Replace //third_party/dart with $dart_src mapped to //flutter/third_party/dart.

BUILD.gn

@@ -8,7 +8,7 @@ import("//flutter/examples/examples.gni")
 import("//flutter/shell/platform/config.gni")
 import("//flutter/shell/platform/glfw/config.gni")
 import("//flutter/testing/testing.gni")
-import("//third_party/dart/build/dart/copy_tree.gni")
+import("$dart_src/build/dart/copy_tree.gni")
 
 # Whether to build the dartdevc sdk, libraries, and source files
 # required for the flutter web sdk.
@@ -104,7 +104,7 @@ group("flutter") {
         # This must be listed explicitly for desktop cross-builds since
         # //flutter/lib/snapshot:generate_snapshot_bin will only build
         # gen_snapshot for the host and not the target.
-        "//third_party/dart/runtime/bin:gen_snapshot",
+        "$dart_src/runtime/bin:gen_snapshot",
 
         # Impeller artifacts - compiler and libtessellator
         "//flutter/impeller/compiler:impellerc",
@@ -117,7 +117,7 @@ group("flutter") {
       if (host_os == "linux") {
         public_deps += [
           # Built alongside gen_snapshot for 64 bit targets
-          "//third_party/dart/runtime/bin:analyze_snapshot",
+          "$dart_src/runtime/bin:analyze_snapshot",
         ]
       }
 
@@ -300,8 +300,7 @@ if (is_fuchsia && enable_unittests) {
 # Dart tree, and is less ambiguous than specifying the binary to build since
 # we can specify the toolchain to use, too.
 if (host_os == "win") {
-  _gen_snapshot_target =
-      "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)"
+  _gen_snapshot_target = "$dart_src/runtime/bin:gen_snapshot($host_toolchain)"
   copy("gen_snapshot") {
     deps = [ _gen_snapshot_target ]
 

build/archives/BUILD.gn

@@ -24,13 +24,13 @@ generated_file("artifacts_entitlement_config") {
 if (build_engine_artifacts && !is_android) {
   zip_bundle("artifacts") {
     deps = [
+      "$dart_src/runtime/bin:gen_snapshot",
       "//flutter/flutter_frontend_server:frontend_server",
       "//flutter/impeller/compiler:impellerc",
       "//flutter/impeller/tessellator:tessellator_shared",
       "//flutter/lib/snapshot:generate_snapshot_bin",
       "//flutter/shell/testing:testing",
       "//flutter/tools/path_ops:path_ops",
-      "//third_party/dart/runtime/bin:gen_snapshot",
     ]
     if (is_mac) {
       # TODO(godofredoc): Remove after paths are standardized flutter/flutter#105351.
@@ -196,7 +196,7 @@ if (build_engine_artifacts && flutter_prebuilt_dart_sdk) {
 # If there is no prebuilt sdk, create the dart sdk archive from the built sdk.
 if (build_engine_artifacts && !flutter_prebuilt_dart_sdk) {
   zip_bundle_from_file("dart_sdk_archive") {
-    deps = [ "//third_party/dart:create_sdk" ]
+    deps = [ "$dart_src:create_sdk" ]
     output = "dart-sdk-$full_target_platform_name.zip"
     files = [
       {

build/bin_to_obj.gni

@@ -5,6 +5,9 @@
 # Generates an assembly file defining a given symbol with the bytes from a
 # binary file. Places the symbol in a text section if 'executable' is true,
 # otherwise places the symbol in a read-only data section.
+
+import("//flutter/build/dart/dart.gni")
+
 template("bin_to_assembly") {
   assert(defined(invoker.deps), "Must define deps")
   assert(defined(invoker.input), "Must define input binary file")
@@ -13,7 +16,7 @@ template("bin_to_assembly") {
 
   action(target_name) {
     deps = invoker.deps
-    script = "//third_party/dart/runtime/tools/bin_to_assembly.py"
+    script = "$dart_src/runtime/tools/bin_to_assembly.py"
     output = "$target_gen_dir/${invoker.input}.S"
     args = [
       "--input",
@@ -57,7 +60,7 @@ template("bin_to_coff") {
 
   action(target_name) {
     deps = invoker.deps
-    script = "//third_party/dart/runtime/tools/bin_to_coff.py"
+    script = "$dart_src/runtime/tools/bin_to_coff.py"
     output = "$target_gen_dir/${invoker.input}.o"
     args = [
       "--input",

build/dart/BUILD.gn

@@ -3,8 +3,10 @@
 # found in the LICENSE file.
 
 import("//flutter/build/concurrent_jobs.gni")
+import("//flutter/build/dart/dart.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/copy_tree.gni")
+
+import("$dart_src/build/dart/copy_tree.gni")
 
 declare_args() {
   # Maximum number of Dart processes to run in parallel.
@@ -35,7 +37,7 @@ if (build_engine_artifacts) {
     }
   } else {
     group("dart_sdk") {
-      public_deps = [ "//third_party/dart:create_sdk" ]
+      public_deps = [ "$dart_src:create_sdk" ]
     }
   }
 }

build/dart/dart.gni

@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  dart_src = "//flutter/third_party/dart"
+}

build/dart/rules.gni

@@ -6,9 +6,11 @@
 
 import("//build/compiled_action.gni")
 import("//build/module_args/dart.gni")
+import("//flutter/build/dart/dart.gni")
 import("//flutter/common/config.gni")
-import("//third_party/dart/build/dart/dart_action.gni")
-import("//third_party/dart/sdk_args.gni")
+
+import("$dart_src/build/dart/dart_action.gni")
+import("$dart_src/sdk_args.gni")
 
 # Generates a Dart kernel snapshot using flutter_frontend_server.
 #
@@ -108,7 +110,7 @@ template("flutter_frontend_server") {
                              [ "pool" ])
       deps = common_deps
       pool = "//flutter/build/dart:dart_pool"
-      script = "//third_party/dart/pkg/frontend_server/bin/frontend_server_starter.dart"
+      script = "$dart_src/pkg/frontend_server/bin/frontend_server_starter.dart"
       inputs = [ invoker.main_dart ]
       outputs = [ invoker.kernel_output ]
       depfile = snapshot_depfile
@@ -179,10 +181,10 @@ template("flutter_snapshot") {
       # By default Dart will create a 32-bit gen_snapshot host binary if the target
       # platform is 32-bit.  Override this to create a 64-bit gen_snapshot for x86
       # targets because some host platforms may not support 32-bit binaries.
-      tool = "//third_party/dart/runtime/bin:gen_snapshot_host_targeting_host"
+      tool = "$dart_src/runtime/bin:gen_snapshot_host_targeting_host"
       toolchain = "//build/toolchain/$host_os:clang_x64"
     } else {
-      tool = "//third_party/dart/runtime/bin:gen_snapshot"
+      tool = "$dart_src/runtime/bin:gen_snapshot"
     }
 
     inputs = [ kernel_output ]

build/secondary/third_party/dart/third_party/pkg/matcher/BUILD.gn

@@ -16,7 +16,7 @@ dart_library("matcher") {
 
   language_version = "2.12"
 
-  deps = [ "//third_party/dart/third_party/pkg/stack_trace" ]
+  deps = [ "$dart_src/third_party/pkg/stack_trace" ]
 
   sources = [
     "expect.dart",

build/secondary/third_party/dart/third_party/pkg/stack_trace/BUILD.gn

@@ -16,7 +16,7 @@ dart_library("stack_trace") {
 
   language_version = "2.12"
 
-  deps = [ "//third_party/dart/third_party/pkg/path" ]
+  deps = [ "$dart_src/third_party/pkg/path" ]
 
   sources = [
     "src/chain.dart",

build/secondary/third_party/pkg/quiver/BUILD.gn

@@ -18,8 +18,8 @@ dart_library("quiver") {
   language_version = "2.0"
 
   deps = [
-    "//third_party/dart/pkg/meta",
-    "//third_party/dart/third_party/pkg/matcher",
+    "$dart_src/pkg/meta",
+    "$dart_src/third_party/pkg/matcher",
   ]
 
   sources = [

ci/pubspec.yaml

@@ -8,13 +8,13 @@ environment:
   sdk: '>=3.2.0-0 <4.0.0'
 
 # Do not add any dependencies that require more than what is provided in
-# //third_party/pkg, //third_party/dart/pkg, or
-# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# //third_party/pkg, $dart_src/pkg, or
+# $dart_src/third_party/pkg. In particular, package:test is not usable
 # here.
 
 # If you do add packages here, make sure you can run `pub get --offline`, and
 # check the .packages and .package_config to make sure all the paths are
-# relative to this directory into //third_party/dart
+# relative to this directory into $dart_src
 
 dependencies:
   args: any
@@ -30,28 +30,28 @@ dev_dependencies:
 
 dependency_overrides:
   args:
-    path: ../../third_party/dart/third_party/pkg/args
+    path: ../../flutter/third_party/dart/third_party/pkg/args
   async:
-    path: ../../third_party/dart/third_party/pkg/async
+    path: ../../flutter/third_party/dart/third_party/pkg/async
   async_helper:
-    path: ../../third_party/dart/pkg/async_helper
+    path: ../../flutter/third_party/dart/pkg/async_helper
   collection:
-    path: ../../third_party/dart/third_party/pkg/collection
+    path: ../../flutter/third_party/dart/third_party/pkg/collection
   expect:
-    path: ../../third_party/dart/pkg/expect
+    path: ../../flutter/third_party/dart/pkg/expect
   file:
-    path: ../../third_party/dart/third_party/pkg/file/packages/file
+    path: ../../flutter/third_party/dart/third_party/pkg/file/packages/file
   litetest:
     path: ../testing/litetest
   meta:
-    path: ../../third_party/dart/pkg/meta
+    path: ../../flutter/third_party/dart/pkg/meta
   path:
-    path: ../../third_party/dart/third_party/pkg/path
+    path: ../../flutter/third_party/dart/third_party/pkg/path
   platform:
     path: ../third_party/pkg/platform
   process:
     path: ../third_party/pkg/process
   process_runner:
     path: ../third_party/pkg/process_runner
   smith:
-    path: ../../third_party/dart/pkg/smith
+    path: ../../flutter/third_party/dart/pkg/smith

display_list/BUILD.gn

@@ -214,6 +214,7 @@ source_set("display_list_benchmarks_source") {
   deps = [
     ":display_list",
     ":display_list_fixtures",
+    "$dart_src/runtime:libdart_jit",  # for tracing
     "//flutter/benchmarking",
     "//flutter/common/graphics",
     "//flutter/display_list/testing:display_list_surface_provider",
@@ -222,7 +223,6 @@ source_set("display_list_benchmarks_source") {
     "//flutter/skia",
     "//flutter/testing:skia",
     "//flutter/testing:testing_lib",
-    "//third_party/dart/runtime:libdart_jit",  # for tracing
   ]
 }
 

flow/BUILD.gn

@@ -187,14 +187,14 @@ if (enable_unittests) {
       ":flow",
       ":flow_fixtures",
       ":flow_testing",
+      "$dart_src/runtime:libdart_jit",  # for tracing
       "//flutter/common/graphics",
       "//flutter/display_list/testing:display_list_testing",
       "//flutter/fml",
       "//flutter/shell/common:base64",
       "//flutter/skia",
       "//flutter/testing:skia",
       "//flutter/testing:testing_lib",
-      "//third_party/dart/runtime:libdart_jit",  # for tracing
       "//third_party/googletest:gtest",
     ]
 

flutter_frontend_server/BUILD.gn

@@ -9,7 +9,7 @@ copy("frontend_server") {
     snapshot =
         "$host_prebuilt_dart_sdk/bin/snapshots/frontend_server.dart.snapshot"
   } else {
-    deps = [ "//third_party/dart/utils/kernel-service:frontend_server" ]
+    deps = [ "$dart_src/utils/kernel-service:frontend_server" ]
     snapshot = "$root_out_dir/frontend_server.dart.snapshot"
   }
 

flutter_frontend_server/pubspec.yaml

@@ -9,13 +9,13 @@ description: Communication pipe to Dart Frontend
 homepage: https://flutter.dev
 
 # Do not add any dependencies that require more than what is provided in
-# //third_party/pkg, //third_party/dart/pkg or
-# //third_party/dart/third_party/pkg. In particular, package:test is not usable
+# //third_party/pkg, $dart_src/pkg or
+# $dart_src/third_party/pkg. In particular, package:test is not usable
 # here.
 
 # If you do add packages here, make sure you can run `pub get --offline`, and
 # check the .packages and .package_config to make sure all the paths are
-# relative to this directory into //third_party/dart
+# relative to this directory into $dart_src
 
 environment:
   sdk: '>=3.2.0-0 <4.0.0'
@@ -26,14 +26,14 @@ dev_dependencies:
 
 dependency_overrides:
   async_helper:
-    path: ../../third_party/dart/pkg/async_helper
+    path: ../../flutter/third_party/dart/pkg/async_helper
   expect:
-    path: ../../third_party/dart/pkg/expect
+    path: ../../flutter/third_party/dart/pkg/expect
   litetest:
     path: ../testing/litetest
   meta:
-    path: ../../third_party/dart/pkg/meta
+    path: ../../flutter/third_party/dart/pkg/meta
   path:
-    path: ../../third_party/dart/third_party/pkg/path
+    path: ../../flutter/third_party/dart/third_party/pkg/path
   smith:
-    path: ../../third_party/dart/pkg/smith
+    path: ../../flutter/third_party/dart/pkg/smith

fml/BUILD.gn

@@ -113,7 +113,7 @@ source_set("fml") {
   ]
 
   deps = [
-    "//third_party/dart/runtime:dart_api",
+    "$dart_src/runtime:dart_api",
 
     # These need to be in sync with the Fuchsia buildroot.
     "//third_party/icu",

lib/io/BUILD.gn

@@ -2,20 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//flutter/build/dart/dart.gni")
+
 source_set("io") {
   sources = [
     "dart_io.cc",
     "dart_io.h",
   ]
 
   deps = [
+    "$dart_src/runtime:dart_api",
+    "$dart_src/runtime/bin:dart_io_api",
     "//flutter/fml",
     "//flutter/third_party/tonic",
-    "//third_party/dart/runtime:dart_api",
-    "//third_party/dart/runtime/bin:dart_io_api",
   ]
 
-  configs += [ "//third_party/dart/runtime:dart_config" ]
+  configs += [ "$dart_src/runtime:dart_config" ]
 
   public_configs = [ "//flutter:config" ]
 }