From f88c8cd463c758ed8deb65a4f0496a4f0103fddc Mon Sep 17 00:00:00 2001
From: yaoxiaoyu <yaoxiaoyu1@huawei.com>
Date: Wed, 27 Oct 2021 10:04:34 +0800
Subject: [PATCH] use no_default_deps to replace mark_as_prebuilts

Signed-off-by: yaoxiaoyu <yaoxiaoyu1@huawei.com>
Change-Id: Ie4495159a6246d362b9020e3b07d83a6f09da498
---
 BUILD.gn                            |  4 --
 config/BUILDCONFIG.gn               | 77 ++++++-----------------------
 config/component/lite_component.gni | 10 ++--
 3 files changed, 22 insertions(+), 69 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 364c3fc..a4a53a3 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -22,10 +22,6 @@ version_info = [
 ]
 write_file("$root_build_dir/etc/version-info", version_info)
 
-# this group will mark the dependent target as prebuilts
-group("mark_as_prebuilts") {
-}
-
 group("prebuilts") {
   public_deps = [ "//prebuilts/lite/sysroot" ]
 }
diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index 1a052f6..86d1643 100755
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -172,70 +172,25 @@ set_defaults("source_set") {
   configs = default_target_configs
 }
 
-template("executable") {
-  executable(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    deps += [ "//build/lite:prebuilts" ]
-  }
-}
-
-template("static_library") {
-  static_library(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    deps += [ "//build/lite:prebuilts" ]
-  }
-}
-
-template("shared_library") {
-  shared_library(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    deps += [ "//build/lite:prebuilts" ]
-  }
-}
-
-template("source_set") {
-  source_set(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    deps += [ "//build/lite:prebuilts" ]
-  }
-}
+_target_type_list = [
+  "executable",
+  "static_library",
+  "shared_library",
+  "source_set",
+  "action",
+  "action_foreach",
+]
 
-template("action") {
-  action(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    marked_as_prebuilts = false
-    foreach(d, deps) {
-      what = "label_no_toolchain"
-      if (get_label_info(d, what) == get_label_info("//build/lite:mark_as_prebuilts", what)) {
-        print(get_label_info(":$target_name", what), "is marked as prebuilts")
-        marked_as_prebuilts = true
+foreach(_target_type, _target_type_list) {
+  template(_target_type) {
+    target(_target_type, target_name) {
+      forward_variables_from(invoker, "*", [ "no_default_deps" ])
+      if (!defined(deps)) {
+        deps = []
       }
-    }
-    if (!marked_as_prebuilts) {
-      deps += [ "//build/lite:prebuilts" ]
-    }
-  }
-}
-
-template("action_foreach") {
-  action_foreach(target_name) {
-    deps = []
-    forward_variables_from(invoker, "*")
-    marked_as_prebuilts = false
-    foreach(d, deps) {
-      what = "label_no_toolchain"
-      if (get_label_info(d, what) == get_label_info("//build/lite:mark_as_prebuilts", what)) {
-        print(get_label_info(":$target_name", what), "is marked as prebuilts")
-        marked_as_prebuilts = true
+      if (!defined(invoker.no_default_deps) || !invoker.no_default_deps) {
+        deps += [ "//build/lite:prebuilts" ]
       }
     }
-    if (!marked_as_prebuilts) {
-      deps += [ "//build/lite:prebuilts" ]
-    }
   }
 }
diff --git a/config/component/lite_component.gni b/config/component/lite_component.gni
index ffff2b3..6f356ba 100644
--- a/config/component/lite_component.gni
+++ b/config/component/lite_component.gni
@@ -100,14 +100,16 @@ template("lite_component") {
 }
 
 template("build_ext_component") {
+  forward_variables_from(invoker, [ "testonly" ])
   if (defined(invoker.version)) {
     print(invoker.version)
   }
   action(target_name) {
-    deps = []
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
+    forward_variables_from(invoker,
+                           [
+                             "no_default_deps",
+                             "deps",
+                           ])
     args = []
     if (defined(invoker.exec_path)) {
       args += [ "--path=${invoker.exec_path}" ]
-- 
GitLab