From 98fc0da9fa78b81cea73b005e43272094f095c1e Mon Sep 17 00:00:00 2001 From: wenjinchao Date: Sat, 16 Nov 2024 20:45:11 +0800 Subject: [PATCH 1/3] extract base Signed-off-by: wenjinchao Change-Id: I2106982965b4f7e42e1afe84fc15b652910f229d --- BUILD.gn | 1 + bundle.json | 16 ++- framework/common/unittest/BUILD.gn | 6 +- .../test/fuzztest/udmfclient_fuzzer/BUILD.gn | 5 +- .../innerkitsimpl/test/unittest/BUILD.gn | 3 + .../innerkitsimpl/test/unittest/html_test.cpp | 1 - .../test/unittest/plain_text_test.cpp | 1 - .../unittest/system_defined_appitem_test.cpp | 1 - .../innerkitsimpl/test/unittest/text_test.cpp | 1 - .../unittest/unified_data_helper_test.cpp | 1 - .../test/unittest/unified_data_test.cpp | 1 - .../test/unittest/unified_meta_test.cpp | 1 - .../test/unittest/unified_record_test.cpp | 1 - .../test/unittest/video_test.cpp | 1 - framework/ndkimpl/unittest/BUILD.gn | 1 + interfaces/cj/BUILD.gn | 5 +- interfaces/innerkits/BUILD.gn | 97 ++++++++++++++----- interfaces/jskits/BUILD.gn | 3 + interfaces/ndk/BUILD.gn | 1 + 19 files changed, 110 insertions(+), 37 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9d1989c..8abe234 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,6 +16,7 @@ import("//build/ohos.gni") group("udmf_packages") { if (is_standard_system) { deps = [ + "interfaces/innerkits:udmf_base", "interfaces/innerkits:udmf_client", "interfaces/innerkits:utd_client", "interfaces/jskits:udmf_data_napi", diff --git a/bundle.json b/bundle.json index 5ce0aa3..97b30df 100644 --- a/bundle.json +++ b/bundle.json @@ -53,6 +53,16 @@ "//foundation/distributeddatamgr/udmf/interfaces/cj:cj_uniform_type_descriptor_ffi" ], "inner_kits": [ + { + "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_base", + "header": { + "header_files": [ + "unified_data.h", + "unified_record.h" + ], + "header_base":"//foundation/distributeddatamgr/udmf/interfaces/innerkits/data" + } + }, { "name": "//foundation/distributeddatamgr/udmf/interfaces/ndk:libudmf", "header": { @@ -77,7 +87,7 @@ } }, { - "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client", + "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_base", "header": { "header_files": [ "error_code.h", @@ -90,7 +100,7 @@ } }, { - "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client", + "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_base", "header": { "header_files": [ "application_defined_record.h", @@ -115,7 +125,7 @@ } }, { - "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_client", + "name": "//foundation/distributeddatamgr/udmf/interfaces/innerkits:udmf_base", "header": { "header_files": [ "ndk_data_conversion.h" diff --git a/framework/common/unittest/BUILD.gn b/framework/common/unittest/BUILD.gn index 4afce7f..5a6a2a3 100644 --- a/framework/common/unittest/BUILD.gn +++ b/framework/common/unittest/BUILD.gn @@ -29,7 +29,10 @@ config("module_private_config") { ] } -common_deps = [ "${udmf_interfaces_path}/innerkits:udmf_client" ] +common_deps = [ + "${udmf_interfaces_path}/innerkits:udmf_client", + "${udmf_interfaces_path}/innerkits:udmf_base" +] common_external_deps = [ "ability_base:want", @@ -113,6 +116,7 @@ ohos_unittest("UdmfTypesUtilAbnormalTest") { deps = [ "${udmf_interfaces_path}/innerkits:udmf_client", + "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:utd_client", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn index bec6e47..78dfd4a 100644 --- a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn +++ b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn @@ -40,7 +40,10 @@ ohos_fuzztest("UdmfClientFuzzTest") { sources = [ "udmf_client_fuzzer.cpp" ] - deps = [ "${udmf_interfaces_path}/innerkits:udmf_client" ] + deps = [ + "${udmf_interfaces_path}/innerkits:udmf_client", + "${udmf_interfaces_path}/innerkits:udmf_base", + ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/framework/innerkitsimpl/test/unittest/BUILD.gn b/framework/innerkitsimpl/test/unittest/BUILD.gn index 974e056..a4080b8 100644 --- a/framework/innerkitsimpl/test/unittest/BUILD.gn +++ b/framework/innerkitsimpl/test/unittest/BUILD.gn @@ -33,6 +33,7 @@ config("module_private_config") { } common_deps = [ + "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:udmf_client", "${udmf_interfaces_path}/innerkits:utd_client", "${udmf_interfaces_path}/ndk:libudmf", @@ -140,6 +141,8 @@ ohos_unittest("ApplicationDefineRecordTest") { deps = common_deps + configs = [ ":module_private_config" ] + external_deps = common_external_deps defines = [ diff --git a/framework/innerkitsimpl/test/unittest/html_test.cpp b/framework/innerkitsimpl/test/unittest/html_test.cpp index 65350fb..a70a768 100644 --- a/framework/innerkitsimpl/test/unittest/html_test.cpp +++ b/framework/innerkitsimpl/test/unittest/html_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "html.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/plain_text_test.cpp b/framework/innerkitsimpl/test/unittest/plain_text_test.cpp index a49d6f7..2317d21 100644 --- a/framework/innerkitsimpl/test/unittest/plain_text_test.cpp +++ b/framework/innerkitsimpl/test/unittest/plain_text_test.cpp @@ -20,7 +20,6 @@ #include "logger.h" #include "plain_text.h" -#include "udmf_capi_common.h" using namespace testing::ext; using namespace OHOS::UDMF; diff --git a/framework/innerkitsimpl/test/unittest/system_defined_appitem_test.cpp b/framework/innerkitsimpl/test/unittest/system_defined_appitem_test.cpp index 8c6b65d..09ded19 100644 --- a/framework/innerkitsimpl/test/unittest/system_defined_appitem_test.cpp +++ b/framework/innerkitsimpl/test/unittest/system_defined_appitem_test.cpp @@ -20,7 +20,6 @@ #include "logger.h" #include "system_defined_appitem.h" -#include "udmf_capi_common.h" using namespace testing::ext; using namespace OHOS::UDMF; diff --git a/framework/innerkitsimpl/test/unittest/text_test.cpp b/framework/innerkitsimpl/test/unittest/text_test.cpp index 22c2f58..007bf98 100644 --- a/framework/innerkitsimpl/test/unittest/text_test.cpp +++ b/framework/innerkitsimpl/test/unittest/text_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "html.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/unified_data_helper_test.cpp b/framework/innerkitsimpl/test/unittest/unified_data_helper_test.cpp index 018e1b4..2ce7946 100644 --- a/framework/innerkitsimpl/test/unittest/unified_data_helper_test.cpp +++ b/framework/innerkitsimpl/test/unittest/unified_data_helper_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "unified_data_helper.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/unified_data_test.cpp b/framework/innerkitsimpl/test/unittest/unified_data_test.cpp index 7fbff42..55147d7 100644 --- a/framework/innerkitsimpl/test/unittest/unified_data_test.cpp +++ b/framework/innerkitsimpl/test/unittest/unified_data_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "unified_data.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/unified_meta_test.cpp b/framework/innerkitsimpl/test/unittest/unified_meta_test.cpp index 2d56908..1e91d91 100644 --- a/framework/innerkitsimpl/test/unittest/unified_meta_test.cpp +++ b/framework/innerkitsimpl/test/unittest/unified_meta_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "unified_meta.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/unified_record_test.cpp b/framework/innerkitsimpl/test/unittest/unified_record_test.cpp index d43a1c7..7d7012c 100644 --- a/framework/innerkitsimpl/test/unittest/unified_record_test.cpp +++ b/framework/innerkitsimpl/test/unittest/unified_record_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "unified_record.h" using namespace testing::ext; diff --git a/framework/innerkitsimpl/test/unittest/video_test.cpp b/framework/innerkitsimpl/test/unittest/video_test.cpp index 0c4b4e9..e164b3b 100644 --- a/framework/innerkitsimpl/test/unittest/video_test.cpp +++ b/framework/innerkitsimpl/test/unittest/video_test.cpp @@ -19,7 +19,6 @@ #include #include "logger.h" -#include "udmf_capi_common.h" #include "video.h" using namespace testing::ext; diff --git a/framework/ndkimpl/unittest/BUILD.gn b/framework/ndkimpl/unittest/BUILD.gn index 22da82a..8f68520 100644 --- a/framework/ndkimpl/unittest/BUILD.gn +++ b/framework/ndkimpl/unittest/BUILD.gn @@ -27,6 +27,7 @@ config("module_private_config") { } common_deps = [ + "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:udmf_client", "${udmf_interfaces_path}/innerkits:utd_client", "${udmf_interfaces_path}/ndk:libudmf", diff --git a/interfaces/cj/BUILD.gn b/interfaces/cj/BUILD.gn index 5546b5b..1b00064 100644 --- a/interfaces/cj/BUILD.gn +++ b/interfaces/cj/BUILD.gn @@ -43,7 +43,10 @@ ohos_shared_library("cj_unified_data_channel_ffi") { "${udmf_interfaces_path}/cj/src/utils.cpp", ] - deps = [ "../innerkits:udmf_client" ] + deps = [ + "../innerkits:udmf_client", + "../innerkits:udmf_base" + ] external_deps = [ "ability_base:base", diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index ecf66dc..aced1f8 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -13,40 +13,27 @@ import("//build/ohos.gni") import("//foundation/distributeddatamgr/udmf/udmf.gni") -config("udmf_client_config") { +config("udmf_base_config") { include_dirs = [ + "${udmf_interfaces_path}/innerkits/data", + "${udmf_framework_path}/common", + "${udmf_framework_path}/innerkitsimpl/service", "${udmf_interfaces_path}/innerkits/client", "${udmf_interfaces_path}/innerkits/common", - "${udmf_interfaces_path}/innerkits/data", "${udmf_interfaces_path}/innerkits/convert", "${udmf_interfaces_path}/ndk/data", - "${udmf_framework_path}/common", - "${udmf_framework_path}/innerkitsimpl/client", - "${udmf_framework_path}/innerkitsimpl/data", - "${udmf_framework_path}/innerkitsimpl/service", - "${udmf_framework_path}/innerkitsimpl/convert", "${udmf_framework_path}/ndkimpl/data", - "${kv_store_path}/frameworks/common", - "//third_party/libuv/include", - "//third_party/node/src", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/src", - "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", - "${kv_store_path}/interfaces/innerkits/distributeddata/include", - "${file_service_path}/interfaces/common/include", - "${file_service_path}/interfaces/innerkits/native/file_uri/include", ] } -ohos_shared_library("udmf_client") { +ohos_shared_library("udmf_base") { branch_protector_ret = "pac_ret" sanitize = { - ubsan = true - boundary_sanitize = true cfi = true cfi_cross_dso = true debug = false } + sources = [ "${udmf_framework_path}/common/endian_converter.cpp", "${udmf_framework_path}/common/tlv_object.cpp", @@ -54,9 +41,7 @@ ohos_shared_library("udmf_client") { "${udmf_framework_path}/common/udmf_radar_reporter.cpp", "${udmf_framework_path}/common/udmf_types_util.cpp", "${udmf_framework_path}/common/udmf_utils.cpp", - "${udmf_framework_path}/innerkitsimpl/client/async_obtain_data.cpp", "${udmf_framework_path}/innerkitsimpl/client/getter_system.cpp", - "${udmf_framework_path}/innerkitsimpl/client/udmf_client.cpp", "${udmf_framework_path}/innerkitsimpl/common/unified_key.cpp", "${udmf_framework_path}/innerkitsimpl/common/unified_meta.cpp", "${udmf_framework_path}/innerkitsimpl/convert/ndk_data_conversion.cpp", @@ -78,12 +63,81 @@ ohos_shared_library("udmf_client") { "${udmf_framework_path}/innerkitsimpl/data/unified_data_helper.cpp", "${udmf_framework_path}/innerkitsimpl/data/unified_record.cpp", "${udmf_framework_path}/innerkitsimpl/data/video.cpp", + ] + + public_configs = [ ":udmf_base_config" ] + + external_deps = [ + "ability_base:zuri", + "access_token:libaccesstoken_sdk", + "app_file_service:fileuri_native", + "c_utils:utils", + "hilog:libhilog", + "hisysevent:libhisysevent", + "image_framework:image_native", + "ipc:ipc_core", + "kv_store:distributeddata_inner", + ] + + public_external_deps = [ + "ability_base:want", + "image_framework:image", + ] + + use_exceptions = true + innerapi_tags = [ "platformsdk" ] + subsystem_name = "distributeddatamgr" + + part_name = "udmf" + cflags_cc = [ "-fvisibility=hidden" ] +} + +config("udmf_client_config") { + include_dirs = [ + "${udmf_interfaces_path}/innerkits/client", + "${udmf_interfaces_path}/innerkits/common", + "${udmf_interfaces_path}/innerkits/data", + "${udmf_interfaces_path}/innerkits/convert", + "${udmf_interfaces_path}/ndk/data", + "${udmf_framework_path}/common", + "${udmf_framework_path}/innerkitsimpl/client", + "${udmf_framework_path}/innerkitsimpl/data", + "${udmf_framework_path}/innerkitsimpl/service", + "${udmf_framework_path}/innerkitsimpl/convert", + "${udmf_framework_path}/ndkimpl/data", + "${kv_store_path}/frameworks/common", + "//third_party/libuv/include", + "//third_party/node/src", + "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/include", + "${kv_store_path}/frameworks/innerkitsimpl/distributeddatafwk/src", + "${kv_store_path}/frameworks/innerkitsimpl/distributeddatasvc/include", + "${kv_store_path}/interfaces/innerkits/distributeddata/include", + "${file_service_path}/interfaces/common/include", + "${file_service_path}/interfaces/innerkits/native/file_uri/include", + ] +} + +ohos_shared_library("udmf_client") { + branch_protector_ret = "pac_ret" + sanitize = { + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + } + sources = [ + "${udmf_framework_path}/common/udmf_utils.cpp", + "${udmf_framework_path}/innerkitsimpl/client/async_obtain_data.cpp", + "${udmf_framework_path}/innerkitsimpl/client/udmf_client.cpp", "${udmf_framework_path}/innerkitsimpl/service/udmf_service_client.cpp", "${udmf_framework_path}/innerkitsimpl/service/udmf_service_proxy.cpp", ] public_configs = [ ":udmf_client_config" ] + deps = [ "${udmf_interfaces_path}/innerkits:udmf_base" ] + external_deps = [ "ability_base:zuri", "access_token:libaccesstoken_sdk", @@ -92,7 +146,6 @@ ohos_shared_library("udmf_client") { "cJSON:cjson", "c_utils:utils", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "hitrace:libhitracechain", "image_framework:image_native", diff --git a/interfaces/jskits/BUILD.gn b/interfaces/jskits/BUILD.gn index 433e68e..789e3dd 100644 --- a/interfaces/jskits/BUILD.gn +++ b/interfaces/jskits/BUILD.gn @@ -74,6 +74,7 @@ ohos_shared_library("unifieddatachannel_napi") { deps = [ "${third_party_path}/bounds_checking_function:libsec_shared", + "../innerkits:udmf_base", "../innerkits:udmf_client", "../jskits:udmf_js_common", ] @@ -117,6 +118,7 @@ ohos_shared_library("uniformtypedescriptor_napi") { deps = [ "${third_party_path}/bounds_checking_function:libsec_shared", + "../innerkits:udmf_base", "../innerkits:udmf_client", "../innerkits:utd_client", "../jskits:udmf_js_common", @@ -174,6 +176,7 @@ ohos_shared_library("udmf_data_napi") { deps = [ "${third_party_path}/bounds_checking_function:libsec_shared", + "../innerkits:udmf_base", "../innerkits:udmf_client", "../jskits:udmf_js_common", ] diff --git a/interfaces/ndk/BUILD.gn b/interfaces/ndk/BUILD.gn index 2db39f2..2b8dce7 100644 --- a/interfaces/ndk/BUILD.gn +++ b/interfaces/ndk/BUILD.gn @@ -39,6 +39,7 @@ ohos_shared_library("libudmf") { defines = [ "API_EXPORT=__attribute__((visibility (\"default\")))" ] deps = [ + "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:udmf_client", "${udmf_interfaces_path}/innerkits:utd_client", ] -- Gitee From 9cf39b93151e2475ae6bf5c8ca5e23345e356274 Mon Sep 17 00:00:00 2001 From: wenjinchao Date: Mon, 18 Nov 2024 10:57:59 +0800 Subject: [PATCH 2/3] extract base Signed-off-by: wenjinchao Change-Id: I7922c880556b3b1b2eadabfe76491d40e2286dd5 --- framework/common/unittest/BUILD.gn | 6 +++--- .../innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn | 4 ++-- interfaces/cj/BUILD.gn | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/common/unittest/BUILD.gn b/framework/common/unittest/BUILD.gn index 5a6a2a3..b16ed10 100644 --- a/framework/common/unittest/BUILD.gn +++ b/framework/common/unittest/BUILD.gn @@ -29,9 +29,9 @@ config("module_private_config") { ] } -common_deps = [ +common_deps = [ + "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:udmf_client", - "${udmf_interfaces_path}/innerkits:udmf_base" ] common_external_deps = [ @@ -115,8 +115,8 @@ ohos_unittest("UdmfTypesUtilAbnormalTest") { configs = [ ":module_private_config" ] deps = [ - "${udmf_interfaces_path}/innerkits:udmf_client", "${udmf_interfaces_path}/innerkits:udmf_base", + "${udmf_interfaces_path}/innerkits:udmf_client", "${udmf_interfaces_path}/innerkits:utd_client", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn index 78dfd4a..d018d92 100644 --- a/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn +++ b/framework/innerkitsimpl/test/fuzztest/udmfclient_fuzzer/BUILD.gn @@ -40,9 +40,9 @@ ohos_fuzztest("UdmfClientFuzzTest") { sources = [ "udmf_client_fuzzer.cpp" ] - deps = [ - "${udmf_interfaces_path}/innerkits:udmf_client", + deps = [ "${udmf_interfaces_path}/innerkits:udmf_base", + "${udmf_interfaces_path}/innerkits:udmf_client", ] external_deps = [ diff --git a/interfaces/cj/BUILD.gn b/interfaces/cj/BUILD.gn index 1b00064..f8ae23e 100644 --- a/interfaces/cj/BUILD.gn +++ b/interfaces/cj/BUILD.gn @@ -43,9 +43,9 @@ ohos_shared_library("cj_unified_data_channel_ffi") { "${udmf_interfaces_path}/cj/src/utils.cpp", ] - deps = [ + deps = [ + "../innerkits:udmf_base", "../innerkits:udmf_client", - "../innerkits:udmf_base" ] external_deps = [ -- Gitee From 8226aa762c98e99b268f2941c7123e37ee183c03 Mon Sep 17 00:00:00 2001 From: wenjinchao Date: Thu, 21 Nov 2024 20:16:36 +0800 Subject: [PATCH 3/3] extract base Signed-off-by: wenjinchao Change-Id: If9066583f810cea7b544b4e50742bd36f1550d1c --- .../innerkitsimpl/test/unittest/BUILD.gn | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/framework/innerkitsimpl/test/unittest/BUILD.gn b/framework/innerkitsimpl/test/unittest/BUILD.gn index a4080b8..6c87b23 100644 --- a/framework/innerkitsimpl/test/unittest/BUILD.gn +++ b/framework/innerkitsimpl/test/unittest/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/distributeddatamgr/udmf/udmf.gni") module_output_path = "udmf/innerkitsImpl" ############################################################################### -config("module_private_config") { +config("module_private_config_client") { include_dirs = [ "${udmf_interfaces_path}/innerkits/client", "${udmf_interfaces_path}/innerkits/common", @@ -32,6 +32,21 @@ config("module_private_config") { ] } +config("module_private_config_base") { + include_dirs = [ + "${udmf_interfaces_path}/innerkits/client", + "${udmf_interfaces_path}/innerkits/common", + "${udmf_interfaces_path}/innerkits/data", + "${udmf_interfaces_path}/innerkits/convert", + "${udmf_interfaces_path}/ndk/data", + "${udmf_framework_path}/common", + "${udmf_framework_path}/innerkits/service", + "${udmf_framework_path}/innerkitsimpl/client/", + "${udmf_framework_path}/innerkitsimpl/test/unittest/mock/include", + "${udmf_framework_path}/ndkimpl/data", + ] +} + common_deps = [ "${udmf_interfaces_path}/innerkits:udmf_base", "${udmf_interfaces_path}/innerkits:udmf_client", @@ -74,7 +89,7 @@ ohos_unittest("UdmfClientTest") { "udmf_client_test.cpp", ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_client" ] deps = common_deps @@ -91,7 +106,7 @@ ohos_unittest("UdmfClientSystemHapTest") { sources = [ "udmf_client_system_hap_test.cpp" ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_client" ] deps = common_deps @@ -110,7 +125,7 @@ ohos_unittest("UtdClientTest") { "utd_client_test.cpp", ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_client" ] deps = [ "${udmf_interfaces_path}/innerkits:utd_client" ] @@ -127,7 +142,7 @@ ohos_unittest("NdkDataConversionTest") { sources = [ "ndk_data_conversion_test.cpp" ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_base" ] deps = common_deps @@ -141,7 +156,7 @@ ohos_unittest("ApplicationDefineRecordTest") { deps = common_deps - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_base" ] external_deps = common_external_deps @@ -171,7 +186,7 @@ ohos_unittest("FileDataTest") { sources = [ "file_test.cpp" ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_base" ] deps = common_deps @@ -459,7 +474,7 @@ ohos_unittest("UdmfClientAbnormalTest") { "udmf_client_abnormal_test.cpp", ] - configs = [ ":module_private_config" ] + configs = [ ":module_private_config_client" ] deps = [ "${udmf_interfaces_path}/innerkits:utd_client", -- Gitee