From 3a8d0a8f2e76b841611afa4aa2cfe3c7edc7a768 Mon Sep 17 00:00:00 2001
From: s_c_c <shichuchao@huawei.com>
Date: Tue, 2 Apr 2024 16:31:32 +0800
Subject: [PATCH] Fix BUILD.gn sysroot path for embedded

---
 innerkits.safwk.BUILD.gn | 10 +++++-----
 safwk.spec               |  5 ++++-
 services.safwk.BUILD.gn  |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/innerkits.safwk.BUILD.gn b/innerkits.safwk.BUILD.gn
index 57dcce2..0cbc51c 100644
--- a/innerkits.safwk.BUILD.gn
+++ b/innerkits.safwk.BUILD.gn
@@ -13,24 +13,24 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
+import("//build/config/sysroot.gni")
 
 # 建立所需头文件链接
-exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/safwk/system_ability.h", "--dest_target", 
+exec_script("//build/openeuler/script/link.py", [ "--src_target", "${sysroot}/usr/include/safwk/system_ability.h", "--dest_target", 
             rebase_path("//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk/system_ability.h") ], "string")
 
-exec_script("//build/openeuler/script/link.py", [ "--src_target", "/usr/include/safwk", "--dest_target", 
+exec_script("//build/openeuler/script/link.py", [ "--src_target", "${sysroot}/usr/include/safwk", "--dest_target", 
             rebase_path("//foundation/systemabilitymgr/safwk/services/safwk/include") ], "string")
 
 config("system_ability_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "../../../services/safwk/include",
-    "//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
+    "${sysroot}/usr/include/safwk",
   ]
 }
 
 ohos_prebuilt_shared_library("system_ability_fwk") {
-  source = "/usr/lib64/libsystem_ability_fwk.z.so"
+  source = "${sysroot}/usr/lib64/libsystem_ability_fwk.z.so"
 
   public_configs = [ ":system_ability_config" ]
 
diff --git a/safwk.spec b/safwk.spec
index 331d85e..1263765 100644
--- a/safwk.spec
+++ b/safwk.spec
@@ -6,7 +6,7 @@
 
 Name: systemabilitymgr_safwk
 Version: 1.0.0
-Release: 4
+Release: 5
 Summary: System ability manager
 License: Apache-2.0
 Url: https://gitee.com/openharmony/systemabilitymgr_safwk
@@ -109,6 +109,9 @@ ln -s /usr/include/safwk/system_ability.h %{safwk_path}/interfaces/innerkits/saf
 %{build_opt}/*
 
 %changelog
+* Tue Apr 2 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-5
+- Fix BUILD.gn sysroot path for embedded
+
 * Mon Apr 1 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-4
 - Fix config_safwk include_dirs for embedded
 
diff --git a/services.safwk.BUILD.gn b/services.safwk.BUILD.gn
index a258444..ba4f24a 100644
--- a/services.safwk.BUILD.gn
+++ b/services.safwk.BUILD.gn
@@ -12,9 +12,10 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//build/config/sysroot.gni")
 
 ohos_prebuilt_executable("sa_main") {
-    source = "/usr/bin/sa_main"
+    source = "${sysroot}/usr/bin/sa_main"
     install_enable = true
 
     part_name = "safwk"