diff --git a/samgr.spec b/samgr.spec index 71dadc8736bca5804286cc1ad0c21044256f71ed..3d18b56876f101266e86842a23292f54a6d99d19 100644 --- a/samgr.spec +++ b/samgr.spec @@ -6,7 +6,7 @@ Name: systemabilitymgr_samgr Version: 1.0.0 -Release: 1 +Release: 2 Summary: System ability manager License: Apache License 2.0 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} %changelog +* Mon Apr 1 2024 s_c_c - 1.0.0-2 +- Fix samgr include_dirs for embedded + * Wed Jun 28 2023 tianhang - 1.0.0-1 - Init and adapt to openeuler diff --git a/samgr_common.gn b/samgr_common.gn index 4b466806383fe6bacbce8fab7a9f58b9bf2e2ed2..5611351197b6c24ede50c867c40e255bfb473e82 100644 --- a/samgr_common.gn +++ b/samgr_common.gn @@ -12,17 +12,18 @@ # limitations under the License. import("//build/ohos.gni") +import("//build/config/sysroot.gni") config("all_config_samgr_common") { include_dirs = [ - "include", + "${sysroot}/usr/include/samgr", ] libs = ["samgr_common.z",] } config("config_samgr_common") { include_dirs = [ - "include", + "${sysroot}/usr/include/samgr", ] libs = ["samgr_common.z",] } diff --git a/samgr_proxy.gn b/samgr_proxy.gn index 49e1ef765b5ef619bf87adc2caa8e812ce30e987..b4d8438436609dfa63a3ae90cb31adfe86980bbf 100644 --- a/samgr_proxy.gn +++ b/samgr_proxy.gn @@ -13,11 +13,12 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") +import("//build/config/sysroot.gni") config("samgr_proxy_config") { include_dirs = [ - "include", - "//third_party/libxml2/include", + "${sysroot}/usr/include/samgr", + "${sysroot}/usr/include/libxml2", ] libs = ["samgr_proxy.z",]