提交 0433631f 编写于 作者: C Caoruihong

chore: sysroot built to out dir

built artifacts should all be placed under out dir.
Signed-off-by: NCaoruihong <crh.cao@huawei.com>
Change-Id: I504f8096e70a46bc43974208b792bef504529112
上级 9d70f9e6
...@@ -225,8 +225,7 @@ Variables_Action_Foreach = Variables_Action ...@@ -225,8 +225,7 @@ Variables_Action_Foreach = Variables_Action
Variables_Source_Set = Variables_Flags + Variables_Deps + Variables_Dependent_Configs + Variables_General Variables_Source_Set = Variables_Flags + Variables_Deps + Variables_Dependent_Configs + Variables_General
Variables_Executable = Variables_Source_Set + Variables_Rust_Variables Variables_Executable = Variables_Source_Set + Variables_Rust_Variables
Variables_Shared_Library = Variables_Executable Variables_Shared_Library = Variables_Executable
Variables_Static_Library = Variables_Executable Variables_Static_Library = Variables_Executable + [ "complete_static_lib" ]
Variables_Static_Library += [ "complete_static_lib" ]
template("executable") { template("executable") {
executable(target_name) { executable(target_name) {
...@@ -236,8 +235,8 @@ template("executable") { ...@@ -236,8 +235,8 @@ template("executable") {
} else { } else {
deps += [ "//build/lite:prebuilts" ] deps += [ "//build/lite:prebuilts" ]
} }
configs = []
if (defined(invoker.configs)) { if (defined(invoker.configs)) {
configs = []
configs += invoker.configs configs += invoker.configs
} }
} }
...@@ -251,8 +250,8 @@ template("static_library") { ...@@ -251,8 +250,8 @@ template("static_library") {
} else { } else {
deps += [ "//build/lite:prebuilts" ] deps += [ "//build/lite:prebuilts" ]
} }
configs = []
if (defined(invoker.configs)) { if (defined(invoker.configs)) {
configs = []
configs += invoker.configs configs += invoker.configs
} }
} }
...@@ -266,8 +265,8 @@ template("shared_library") { ...@@ -266,8 +265,8 @@ template("shared_library") {
} else { } else {
deps += [ "//build/lite:prebuilts" ] deps += [ "//build/lite:prebuilts" ]
} }
configs = []
if (defined(invoker.configs)) { if (defined(invoker.configs)) {
configs = []
configs += invoker.configs configs += invoker.configs
} }
} }
...@@ -281,8 +280,8 @@ template("source_set") { ...@@ -281,8 +280,8 @@ template("source_set") {
} else { } else {
deps += [ "//build/lite:prebuilts" ] deps += [ "//build/lite:prebuilts" ]
} }
configs = []
if (defined(invoker.configs)) { if (defined(invoker.configs)) {
configs = []
configs += invoker.configs configs += invoker.configs
} }
} }
......
...@@ -47,7 +47,7 @@ declare_args() { ...@@ -47,7 +47,7 @@ declare_args() {
ohos_current_strip_command = "" ohos_current_strip_command = ""
# Current sysroot path. E.g. "//prebuilts/lite/sysroot". # Current sysroot path. E.g. "//prebuilts/lite/sysroot".
ohos_current_sysroot = "//prebuilts/lite/sysroot" ohos_current_sysroot = "$root_out_dir/sysroot"
} }
if (product_path != "") { if (product_path != "") {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册