!939 refactor: sysroot部件化

Merge pull request !939 from Zhaotianyu/cherry-pick-1658840206
fixed 1568c31 from https://gitee.com/arvinzzz/kernel_liteos_a/pulls/934
2022-07-26 15:40:34 +00:00 · 2022-07-26 12:56:47 +00:00
4 changed files with 4 additions and 4 deletions
--- a/BUILD.gn
+++ b/BUILD.gn
@ -323,7 +323,7 @@ group("liteos_a") {
    deps += [
      ":apps",
      ":tests",
-      "//prebuilts/lite/sysroot/build:strip",
+      "//third_party/musl/scripts/build_lite:strip",
    ]
    if (liteos_skip_make == false) {
      deps += [ ":make" ]
--- a/2
+++ b/2
@ -121,7 +121,7 @@ sysroot:
 	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
 ifeq ($(origin SYSROOT_PATH),file)
 	$(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \
-	ln -snf $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/build/Makefile && \
+	ln -snf $(LITEOSTOPDIR)/../../third_party/musl/scripts/build_lite/Makefile && \
 	$(MAKE) TARGETS=liteos_a_user \
 		ARCH=$(ARCH) \
 		TARGET=$(LOSCFG_LLVM_TARGET) \
--- a/apps/mksh/BUILD.gn
+++ b/apps/mksh/BUILD.gn
@ -42,7 +42,7 @@ copy("copy_mksh_src") {

 build_ext_component("build_mksh") {
  deps = [ ":copy_mksh_src" ]
-  deps += [ "//prebuilts/lite/sysroot" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
  exec_path = rebase_path("$target_out_dir/mksh_build")

  cflags = [
--- a/apps/toybox/BUILD.gn
+++ b/apps/toybox/BUILD.gn
@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
    ":copy_toybox_config",
    ":copy_toybox_src",
  ]
-  deps += [ "//prebuilts/lite/sysroot" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
  exec_path = rebase_path("$target_out_dir/toybox_build")

  cflags = [
Author	SHA1	Message	Date
openharmony_ci	bd864ea871	!939 refactor: sysroot部件化 Merge pull request !939 from Zhaotianyu/cherry-pick-1658840206	2022-07-26 15:40:34 +00:00
arvinzzz	e7c1633f00	fixed `1568c31` from https://gitee.com/arvinzzz/kernel_liteos_a/pulls/934 refactor: sysroot部件化 close: #I5HF8S Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: I727b10c3b419fc71e228f5ad92abc107e756bbac	2022-07-26 12:56:47 +00:00