From ea62c60daaa37f2df054550e2e419a0f351c35b5 Mon Sep 17 00:00:00 2001 From: wujianlin Date: Wed, 13 Dec 2023 04:25:21 +0000 Subject: [PATCH] The utilsbase static library is controlled and is not visible to modules that do not have to use the utilsbase static library Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/I8M9T6?from=project-issue Signed-off-by: wujianlin --- base/BUILD.gn | 64 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 2dda763..2b214e3 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -27,14 +27,59 @@ config("utils_config") { include_dirs = [ "include" ] } -config("utils_coverage_config") { - visibility = [ ":*" ] +config("utils_common_config") { if (c_utils_feature_coverage) { cflags = [ "--coverage" ] ldflags = [ "--coverage" ] } } +config("utils_visibility_config") { + visibility = [ ":*" ] +} + +config("utilsbase_visibility_config") { + visibility = [ + "//applications/standard/contacts_data:contactsdataability", + "//applications/standard/contacts_data/test:contacts_test", + "//base/customization/enterprise_device_management/test/unittest/account_manager_proxy:EdmAccountManagerProxyUnitTest", + "//base/customization/enterprise_device_management/test/unittest/application_manager_proxy:EdmApplicationManagerProxyUnitTest", + "//base/customization/enterprise_device_management/test/unittest/browser_proxy:EdmBrowserProxyUnitTest", + "//base/customization/enterprise_device_management/test/unittest/bundle_manager_proxy:EdmBundleManagerProxyUnitTest", + "//base/customization/enterprise_device_management/test/unittest/datetime_manager_proxy:EdmDataTimeManagerProxyUnitTest", + "//commonlibrary/c_utils/base:utilsbase", + "//developtools/hdc:*", + "//drivers/external_device_manager/services/native/driver_extension_controller", + "//foundation/ability/ability_runtime/test/moduletest/ability_record_test:AbilityRecordModuleTest", + "//foundation/ability/ability_runtime/test/moduletest/ipc_ability_connect_test:IpcAbilityConnectModuleTest", + "//foundation/ability/ability_runtime/test/moduletest/ipc_ability_scheduler_test:IpcAbilitySchedulerModuleTest", + "//foundation/ability/ability_runtime/test/unittest/dfr_test/watchdog_test:watchdog_test", + "//foundation/ability/ability_runtime/test/unittest/frameworks_kits_appkit_native_test:ability_start_setting_test", + "//foundation/ability/ability_runtime/test/unittest/mission_list_test:mission_list_test_call", + "//foundation/distributeddatamgr/preferences/interfaces/inner_api:native_preferences", + "//foundation/distributeddatamgr/relational_store/interfaces/inner_api/rdb:native_rdb", + "//foundation/filemanagement/dfs_service/test/unittests/cloudsync_sa/system:dfsu_access_token_helper_test", + "//foundation/filemanagement/dfs_service/utils:libdistributedfileutils", + "//foundation/filemanagement/file_api/interfaces/test/unittest/filemgmt_libn_test:filemgmt_libn_test", + "//foundation/filemanagement/file_api/interfaces/test/unittest/remote_uri:remote_uri _test", + "//foundation/multimedia/histreamer/engine/plugin/plugins/source/video_capture:histreamer_plugin_StdVideoCapture", + "//vendor/huawei/base/hiviewdfx/analytics_native/frameworks/native/libanalytics_native:analyticskit_base", + "//vendor/huawei/base/hiviewdfx/analytics_native/test:AnalyticsDataProcessorTest", + "//vendor/huawei/domains/carservice/car_distributed_engine/interfaces/innerkits:cardistributedengine_client", + "//vendor/huawei/domains/cloud/hianalytics _service/interfaces/innerkits:ha_client", + "//vendor/huawei/domains/cloud/hianalytics_service/services:ha_service", + "//vendor/huawei/domains/finddevice/findnetwork/frameworks/native:findnetwork_client", + "//vendor/huawei/domains/push/push_manager_service/frameworks/native/push_service:push_service_client", + "//vendor/huawei/domains/push/push_manager_service/frameworks/native/push_service:push_service_client_static", + "//vendor/huawei/domains/push/push_manager_service/frameworks/native/service_notification:service_notification_client", + "//vendor/huawei/foundation/multimedia/algorithm_camera/facerecognize_algo/ca/normal:libfaceid_ca_normal", + "//vendor/huawei/foundation/multimedia/algorithm_camera/facerecognize_algo/ca/secure:libfaceid_ca_secure", + "//vendor/huawei/foundation/multimedia/algorithm_camera/facerecognize_algo/server/single_framework:libfaceid_ca", + "//vendor/huawei/foundation/multimedia/algorithm_camera/refine_engine/platform/server:libips_core", + "//vendor/huawei/foundation/multimedia/audio_algorithm /voip:libaudio.hal.effect", + ] +} + config("debug_log_enabled") { visibility = [ ":*" ] defines = [ "DEBUG_UTILS" ] @@ -96,9 +141,13 @@ if (current_os == "ios") { } ohos_static_library("utilsbase") { + configs = [ + ":utils_common_config", + ":utilsbase_visibility_config", + ] + if (current_os == "ios") { sources = sources_utils_ios - configs = [ ":utils_coverage_config" ] all_dependent_configs = [ ":utils_config" ] public_deps = [ "//third_party/bounds_checking_function:libsec_static" ] defines = [ "IOS_PLATFORM" ] @@ -107,7 +156,6 @@ ohos_static_library("utilsbase") { part_name = "c_utils" } else { sources = sources_utils - configs = [ ":utils_coverage_config" ] all_dependent_configs = [ ":utils_config" ] if (current_os != "android" && current_os != "ios") { defines = [ "CONFIG_HILOG" ] @@ -144,9 +192,14 @@ ohos_shared_library("utils") { "platformsdk", "sasdk", ] + + configs = [ + ":utils_common_config", + ":utils_visibility_config", + ] + if (current_os == "ios") { sources = sources_utils_ios - configs = [ ":utils_coverage_config" ] all_dependent_configs = [ ":utils_config" ] public_deps = [ "//third_party/bounds_checking_function:libsec_shared" ] defines = [ "IOS_PLATFORM" ] @@ -155,7 +208,6 @@ ohos_shared_library("utils") { part_name = "c_utils" } else { sources = sources_utils - configs = [ ":utils_coverage_config" ] if (!is_arkui_x) { if (c_utils_feature_intsan) { -- Gitee