diff --git a/binder.BUILD.gn b/binder.BUILD.gn index dd0da82..0c2276f 100644 --- a/binder.BUILD.gn +++ b/binder.BUILD.gn @@ -12,11 +12,12 @@ # limitations under the License. import("//build/ohos.gni") +import("//build/config/sysroot.gni") config("libdbinder_config") { include_dirs = [ - " /usr/include/c_utils", - "/usr/include/ipc", + "${sysroot}/usr/include/c_utils", + "${sysroot}/usr/include/ipc", ] libs = [ "dbinder.z" ] } diff --git a/communication_ipc.spec b/communication_ipc.spec index 4135fcf..669834a 100644 --- a/communication_ipc.spec +++ b/communication_ipc.spec @@ -12,7 +12,7 @@ Name: communication_ipc Version: 1.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Inter-process communication (IPC) and Remote Procedure Call (RPC) License: Apache-2.0 and GPL-2.0 URL: https://gitee.com/openharmony/communication_ipc @@ -230,6 +230,9 @@ insmod /%{ashmem_dest_path}/*.ko %endif %changelog +* Wed Apr 3 2024 s_c_c - 1.0.0-6 +- Fix sdk and binder sysroot path for embedded + * Tue Mar 26 2024 s_c_c - 1.0.0-5 - Fix ipc_util_config include_dirs for embedded diff --git a/sdk.BUILD.gn b/sdk.BUILD.gn index 73934c3..822696f 100644 --- a/sdk.BUILD.gn +++ b/sdk.BUILD.gn @@ -13,18 +13,14 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") +import("//build/config/sysroot.gni") dsoftbus_root_path = "//foundation/communication/dsoftbus" config("dsoftbus_sdk_interface") { include_dirs = [ - "$dsoftbus_root_path/interfaces/kits", - "$dsoftbus_root_path/interfaces/kits/bus_center", - "$dsoftbus_root_path/interfaces/kits/common", - "$dsoftbus_root_path/interfaces/kits/discovery", - "$dsoftbus_root_path/interfaces/kits/transport", + "${sysroot}/usr/include/dsoftbus", "$dsoftbus_root_path/sdk/transmission/session/cpp/include", - "$dsoftbus_root_path/interfaces/inner_kits/transport", "$dsoftbus_root_path/core/common/dfx/hisysevent_adapter/include", ] libs = [ "softbus_client.z" ]