提交 a62d3af0 编写于 作者: O openharmony_ci 提交者: Gitee

!274 use no_default_deps to replace mark_as_prebuilts

Merge pull request !274 from yaoxiaoyu_903c/master
......@@ -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" ]
}
......
......@@ -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" ]
}
}
}
......@@ -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}" ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册