!7 适配嵌入式环境,修复错误
From: @s-c-c Reviewed-by: @yukaii Signed-off-by: @yukaii
This commit is contained in:
commit
80a11984bb
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: systemabilitymgr_samgr
|
Name: systemabilitymgr_samgr
|
||||||
Version: 1.0.0
|
Version: 1.0.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: System ability manager
|
Summary: System ability manager
|
||||||
License: Apache License 2.0
|
License: Apache License 2.0
|
||||||
Url: https://gitee.com/openharmony/systemabilitymgr_samgr
|
Url: https://gitee.com/openharmony/systemabilitymgr_samgr
|
||||||
@ -108,6 +108,9 @@ ln -s /usr/include/samgr %{buildroot}/%{build_opt}%{samgr_path}/services/lsamgr/
|
|||||||
%{build_opt}%{samgr_path}
|
%{build_opt}%{samgr_path}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 1 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-2
|
||||||
|
- Fix samgr include_dirs for embedded
|
||||||
|
|
||||||
* Wed Jun 28 2023 tianhang <tian_hang@hoperun.com> - 1.0.0-1
|
* Wed Jun 28 2023 tianhang <tian_hang@hoperun.com> - 1.0.0-1
|
||||||
- Init and adapt to openeuler
|
- Init and adapt to openeuler
|
||||||
|
|
||||||
|
|||||||
@ -12,17 +12,18 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import("//build/ohos.gni")
|
import("//build/ohos.gni")
|
||||||
|
import("//build/config/sysroot.gni")
|
||||||
|
|
||||||
config("all_config_samgr_common") {
|
config("all_config_samgr_common") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"include",
|
"${sysroot}/usr/include/samgr",
|
||||||
]
|
]
|
||||||
libs = ["samgr_common.z",]
|
libs = ["samgr_common.z",]
|
||||||
}
|
}
|
||||||
|
|
||||||
config("config_samgr_common") {
|
config("config_samgr_common") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"include",
|
"${sysroot}/usr/include/samgr",
|
||||||
]
|
]
|
||||||
libs = ["samgr_common.z",]
|
libs = ["samgr_common.z",]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,11 +13,12 @@
|
|||||||
|
|
||||||
import("//build/ohos.gni")
|
import("//build/ohos.gni")
|
||||||
import("//build/ohos_var.gni")
|
import("//build/ohos_var.gni")
|
||||||
|
import("//build/config/sysroot.gni")
|
||||||
|
|
||||||
config("samgr_proxy_config") {
|
config("samgr_proxy_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"include",
|
"${sysroot}/usr/include/samgr",
|
||||||
"//third_party/libxml2/include",
|
"${sysroot}/usr/include/libxml2",
|
||||||
]
|
]
|
||||||
|
|
||||||
libs = ["samgr_proxy.z",]
|
libs = ["samgr_proxy.z",]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user