packages/systemabilitymgr_safwk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BUILD.gn sysroot path for embedded

Browse Source
This commit is contained in:
s_c_c 2024-04-02 16:31:32 +08:00
parent 287bc1ee92
commit 3a8d0a8f2e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
innerkits.safwk.BUILD.gn
View File

@ -13,24 +13,24 @@
import("//build/ohos.gni") import("//build/ohos.gni")
import("//build/ohos_var.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") 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") rebase_path("//foundation/systemabilitymgr/safwk/services/safwk/include") ], "string")
config("system_ability_config") { config("system_ability_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"../../../services/safwk/include", "${sysroot}/usr/include/safwk",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
] ]
} }
ohos_prebuilt_shared_library("system_ability_fwk") { 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" ] public_configs = [ ":system_ability_config" ]

5
safwk.spec
View File

@ -6,7 +6,7 @@
Name: systemabilitymgr_safwk Name: systemabilitymgr_safwk
Version: 1.0.0 Version: 1.0.0
Release: 4 Release: 5
Summary: System ability manager Summary: System ability manager
License: Apache-2.0 License: Apache-2.0
Url: https://gitee.com/openharmony/systemabilitymgr_safwk 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}/* %{build_opt}/*
%changelog %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 * Mon Apr 1 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-4
- Fix config_safwk include_dirs for embedded - Fix config_safwk include_dirs for embedded

3
services.safwk.BUILD.gn
View File

@ -12,9 +12,10 @@
# limitations under the License. # limitations under the License.
import("//build/ohos.gni") import("//build/ohos.gni")
import("//build/config/sysroot.gni")
ohos_prebuilt_executable("sa_main") { ohos_prebuilt_executable("sa_main") {
source = "/usr/bin/sa_main" source = "${sysroot}/usr/bin/sa_main"
install_enable = true install_enable = true
part_name = "safwk" part_name = "safwk"