From 58bf9a8e0380364285358bf4f922f5b78b7f0ed9 Mon Sep 17 00:00:00 2001 From: zeng-xiangshun Date: Tue, 16 Apr 2024 15:23:18 +0800 Subject: [PATCH] normalize build dependencies Signed-off-by: zeng-xiangshun --- bundle.json | 4 +--- .../cert_manager_standard/main/common/BUILD.gn | 4 ++-- .../main/os_dependency/BUILD.gn | 2 +- .../cert_manager_engine/main/core/BUILD.gn | 3 +-- .../main/core/include/cert_manager_updateflag.h | 3 +-- .../cert_manager_service/main/os_dependency/BUILD.gn | 2 -- .../main/os_dependency/idl/BUILD.gn | 3 +-- test/BUILD.gn | 7 +++---- test/unittest/common_permission_test/BUILD.gn | 5 ++--- test/unittest/inner_permission_test/BUILD.gn | 5 ++--- test/unittest/module_test/BUILD.gn | 12 ++++++------ test/unittest/multi_thread_test/BUILD.gn | 5 ++--- 12 files changed, 22 insertions(+), 33 deletions(-) diff --git a/bundle.json b/bundle.json index d29fdf4..076f65a 100644 --- a/bundle.json +++ b/bundle.json @@ -42,9 +42,7 @@ "os_account", "safwk", "samgr", - "security_guard" - ], - "third_party": [ + "security_guard", "openssl" ] }, diff --git a/frameworks/cert_manager_standard/main/common/BUILD.gn b/frameworks/cert_manager_standard/main/common/BUILD.gn index f06faf4..eec54ea 100644 --- a/frameworks/cert_manager_standard/main/common/BUILD.gn +++ b/frameworks/cert_manager_standard/main/common/BUILD.gn @@ -37,7 +37,6 @@ ohos_static_library("libcert_manager_common_standard_static") { [ ":cert_manager_config" ] # Share include files for other gn when deps. include_dirs = [ - "//third_party/openssl/include", "../../../../interfaces/innerkits/cert_manager_standard/main/include", ] @@ -47,10 +46,11 @@ ohos_static_library("libcert_manager_common_standard_static") { "src/cm_x509.c", ] - deps = [ "//third_party/openssl:libcrypto_shared" ] + deps = [] external_deps = [ "c_utils:utils", "huks:libhukssdk", + "openssl:libcrypto_shared", ] cflags = [ "-DHILOG_ENABLE", diff --git a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn index b8429f5..dd9f05d 100644 --- a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn +++ b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn @@ -84,13 +84,13 @@ ohos_static_library("libcert_manager_ipc_client_static") { ] deps = [ ":libcert_manager_log_mem_static", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", + "openssl:libcrypto_shared", ] cflags_cc = [ "-DHILOG_ENABLE", diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn index e7e3526..2809474 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn @@ -37,7 +37,6 @@ ohos_static_library("cert_manager_engine_core_standard") { ] include_dirs = [ "../../../../../interfaces/innerkits/cert_manager_standard/main/include", - "//third_party/openssl/include", ] cflags = [ "-Wall", @@ -70,7 +69,6 @@ ohos_static_library("cert_manager_engine_core_standard") { deps = [ "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -78,5 +76,6 @@ ohos_static_library("cert_manager_engine_core_standard") { "c_utils:utils", "huks:libhukssdk", "ipc:ipc_core", + "openssl:libcrypto_shared", ] } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h index c024436..2fc7827 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h +++ b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h @@ -18,7 +18,6 @@ #include #include -#include "openssl/ossl_typ.h" #include "cm_type.h" #ifdef __cplusplus @@ -77,4 +76,4 @@ int32_t CmBakeupAllSaUserCerts(void); } #endif -#endif \ No newline at end of file +#endif diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn index 008c10e..3ce435f 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn @@ -26,7 +26,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") { ubsan = true } include_dirs = [ - "//third_party/openssl/include", "../../../cert_manager_engine/main/core/include", "../../../../../interfaces/innerkits/cert_manager_standard/main/include", ] @@ -40,7 +39,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") { "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", "idl:libcm_service_idl_standard_static", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn index 0a3e3af..1f70a39 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn @@ -31,7 +31,6 @@ ohos_static_library("libcm_service_idl_standard_static") { ubsan = true } include_dirs = [ - "//third_party/openssl/include", "../../../../../../interfaces/innerkits/cert_manager_standard/main/include", "../../../../cert_manager_engine/main/core/include", ] @@ -49,13 +48,13 @@ ohos_static_library("libcm_service_idl_standard_static") { "../../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", "../../hisysevent_wrapper:libcert_manager_hisysevent_wrapper_static", "../../security_guard_report:libcert_manager_sg_report_static", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "c_utils:utils", "huks:libhukssdk", "ipc:ipc_core", "os_account:os_account_innerkits", + "openssl:libcrypto_shared", ] if (support_jsapi) { diff --git a/test/BUILD.gn b/test/BUILD.gn index 42a66b8..071156e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -36,7 +36,6 @@ ohos_unittest("cm_sdk_test") { ] include_dirs = [ - "//third_party/bounds_checking_function/include", "unittest/include", ] cflags_cc = [ @@ -57,15 +56,15 @@ ohos_unittest("cm_sdk_test") { deps = [ "../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", "../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", - "//third_party/openssl:libcrypto_shared", ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest", + "openssl:libcrypto_shared", ] resource_config_file = "./resource/certificate_manager/ohos_test.xml" diff --git a/test/unittest/common_permission_test/BUILD.gn b/test/unittest/common_permission_test/BUILD.gn index 604ea58..80851d9 100644 --- a/test/unittest/common_permission_test/BUILD.gn +++ b/test/unittest/common_permission_test/BUILD.gn @@ -24,7 +24,6 @@ ohos_unittest("cm_common_permission_test") { include_dirs = [ "../include", - "//third_party/bounds_checking_function/include", ] cflags_cc = [ "-Wall", @@ -44,8 +43,6 @@ ohos_unittest("cm_common_permission_test") { deps = [ "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", ] defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ @@ -53,5 +50,7 @@ ohos_unittest("cm_common_permission_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest", ] } diff --git a/test/unittest/inner_permission_test/BUILD.gn b/test/unittest/inner_permission_test/BUILD.gn index 58786e8..798f033 100644 --- a/test/unittest/inner_permission_test/BUILD.gn +++ b/test/unittest/inner_permission_test/BUILD.gn @@ -24,7 +24,6 @@ ohos_unittest("cm_inner_permission_test") { include_dirs = [ "../include", - "//third_party/bounds_checking_function/include", ] cflags_cc = [ "-Wall", @@ -44,8 +43,6 @@ ohos_unittest("cm_inner_permission_test") { deps = [ "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", ] defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ @@ -53,5 +50,7 @@ ohos_unittest("cm_inner_permission_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest", ] } diff --git a/test/unittest/module_test/BUILD.gn b/test/unittest/module_test/BUILD.gn index 3c82655..8d4346c 100644 --- a/test/unittest/module_test/BUILD.gn +++ b/test/unittest/module_test/BUILD.gn @@ -24,8 +24,6 @@ ohos_unittest("cm_module_test") { ] include_dirs = [ - "//third_party/bounds_checking_function/include", - "//third_party/openssl/include", "include", "../include", ] @@ -47,10 +45,12 @@ ohos_unittest("cm_module_test") { deps = [ "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", - "//third_party/openssl:libcrypto_shared", ] defines = [ "_CM_LOG_ENABLE_" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest", + "openssl:libcrypto_shared", + ] } diff --git a/test/unittest/multi_thread_test/BUILD.gn b/test/unittest/multi_thread_test/BUILD.gn index d41f414..9d4b5a9 100644 --- a/test/unittest/multi_thread_test/BUILD.gn +++ b/test/unittest/multi_thread_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("cm_multi_thread_test") { include_dirs = [ "../include", - "//third_party/bounds_checking_function/include", ] cflags_cc = [ "-Wall", @@ -47,8 +46,6 @@ ohos_unittest("cm_multi_thread_test") { deps = [ "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "//third_party/bounds_checking_function:libsec_static", - "//third_party/googletest:gtest_main", ] defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ @@ -56,5 +53,7 @@ ohos_unittest("cm_multi_thread_test") { "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "bounds_checking_function:libsec_static", + "googletest:gtest", ] } -- Gitee