From 4a347699e7bdd7cf48291c2bfef65bacbacea1e4 Mon Sep 17 00:00:00 2001
From: "P.Y. Laligand" <py.laligand@gmail.com>
Date: Fri, 30 Mar 2018 19:27:15 -0700
Subject: [PATCH] [fuchsia] Use the dart_library template instead of the build
 system's implementation. (#4908)

---
 lib/snapshot/BUILD.gn     | 42 ++++++++++-----------------------------
 lib/snapshot/pubspec.yaml |  5 +++++
 2 files changed, 16 insertions(+), 31 deletions(-)
 create mode 100644 lib/snapshot/pubspec.yaml

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
index 03b23a58ae..3aebf85512 100644
--- a/lib/snapshot/BUILD.gn
+++ b/lib/snapshot/BUILD.gn
@@ -7,6 +7,7 @@ import("//third_party/dart/utils/compile_platform.gni")
 import("//third_party/dart/utils/generate_entry_points_json.gni")
 
 if (is_fuchsia) {
+  import("//build/dart/dart_library.gni")
   import("//build/dart/toolchain.gni")
   import("//topaz/public/dart-pkg/fuchsia/sdk_ext.gni")
   import("//topaz/public/dart-pkg/zircon/sdk_ext.gni")
@@ -24,39 +25,18 @@ copy("generate_dart_ui") {
 }
 
 if (is_fuchsia) {
-  action("generate_package_map") {
-    dart_deps = [
-      "//topaz/public/dart/fuchsia",
-      "//topaz/public/dart/zircon",
-    ]
+  dart_library("generate_package_map") {
+    # The sole purpose of this target is to generate a .packages file.
+    sources = []
 
-    dot_packages_file = "$target_gen_dir/snapshot.packages"
-    outputs = [
-      dot_packages_file
-    ]
-    deps = []
-    foreach(dep, dart_deps) {
-      deps += [ "$dep($dart_toolchain)" ]
-    }
+    infer_package_name = true
 
-    depfile = "$dot_packages_file.d"
+    disable_analysis = true
 
-    script = "//build/dart/gen_dot_packages.py"
-    args = [
-      "--out",
-      rebase_path(dot_packages_file, root_build_dir),
-      "--source-dir",
-      rebase_path("."),
-      "--root-build-dir",
-      rebase_path(root_build_dir),
-      "--root-gen-dir",
-      rebase_path(dart_root_gen_dir),
-      "--package-name",
-      "snapshot_root",
-      "--depfile",
-      rebase_path(depfile),
-      "--deps",
-    ] + dart_deps
+    deps = [
+      "//topaz/public/dart/fuchsia",
+      "//topaz/public/dart/zircon",
+    ]
   }
 }
 
@@ -157,7 +137,7 @@ action("generate_snapshot_bin") {
       "--url_mapping=dart:fuchsia,$fuchsia_path",
       "--url_mapping=dart:mozart.internal,$mozart_internal_path",
       "--packages",
-      rebase_path("$target_gen_dir/snapshot.packages"),
+      rebase_path("$target_gen_dir/generate_package_map.packages"),
       "--load_compilation_trace",
       rebase_path("fuchsia_compilation_trace.txt"),
     ]
diff --git a/lib/snapshot/pubspec.yaml b/lib/snapshot/pubspec.yaml
new file mode 100644
index 0000000000..1b1139ebc4
--- /dev/null
+++ b/lib/snapshot/pubspec.yaml
@@ -0,0 +1,5 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This file is needed by Fuchsia's dart_library template.
-- 
GitLab