From 7b0f91e31687521d1b5b22b2167e2245edebfc25 Mon Sep 17 00:00:00 2001 From: s_c_c Date: Sat, 29 Jun 2024 11:36:17 +0800 Subject: [PATCH] feat for embedded permissive and include_dirs errors --- services/distributeddataservice/adapter/communicator/BUILD.gn | 2 +- services/distributeddataservice/adapter/dfx/BUILD.gn | 2 +- services/distributeddataservice/app/BUILD.gn | 4 +++- services/distributeddataservice/service/BUILD.gn | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/adapter/communicator/BUILD.gn b/services/distributeddataservice/adapter/communicator/BUILD.gn index 3b9cc42..936157b 100644 --- a/services/distributeddataservice/adapter/communicator/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/BUILD.gn @@ -47,7 +47,7 @@ ohos_static_library("distributeddata_communicator_static") { "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational", ] - cflags_cc = [ "-fvisibility=hidden", + cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w", "-Wno-sign-compare",] deps = [ diff --git a/services/distributeddataservice/adapter/dfx/BUILD.gn b/services/distributeddataservice/adapter/dfx/BUILD.gn index a471f5f..4740781 100644 --- a/services/distributeddataservice/adapter/dfx/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/BUILD.gn @@ -39,7 +39,7 @@ ohos_static_library("distributeddata_dfx_static") { "//third_party/openssl/include/", ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ] deps = [ "../autils:distributeddata_autils_static", diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 1e97cb7..633a96b 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//build/ohos_var.gni") +import("//build/config/sysroot.gni") import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni") group("build_module") { @@ -73,11 +74,12 @@ config("module_private_config") { "src/security", "src/backup_rule/include", "//third_party/json/single_include", + "${sysroot}/usr/include/device_manager/", ] cflags = [ "-Wno-multichar" ] - cflags_cc = [ "-fvisibility=hidden" ] + cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ] } ohos_shared_library("distributeddataservice") { diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index 3fb8263..f7879e0 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") import("//build/ohos_var.gni") +import("//build/config/sysroot.gni") group("build_module") { deps = [ ":distributeddatasvc" ] @@ -47,6 +48,7 @@ config("module_public_config") { "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", + "${sysroot}/usr/include/device_manager/", ] } @@ -101,7 +103,7 @@ ohos_shared_library("distributeddatasvc") { ] cflags = [ "-Wno-multichar" ] - cflags_cc = [ "-fvisibility=hidden", "-Wno-format" ] + cflags_cc = [ "-fvisibility=hidden", "-Wno-format", "-fpermissive", "-w" ] configs = [ ":module_public_config" ] -- 2.45.2.windows.1