diff --git a/0008-remove-dependency-and-adapt-for-build-huks.patch b/0008-remove-dependency-and-adapt-for-build-huks.patch index dc8de4a1e52117629427b245762bc7feac41525c..4a4085b9db5db60c7cc2971a07873664f4a5f618 100644 --- a/0008-remove-dependency-and-adapt-for-build-huks.patch +++ b/0008-remove-dependency-and-adapt-for-build-huks.patch @@ -1,9 +1,10 @@ -From 9fe22ea5837611fadad5c9270417e62b1debf070 Mon Sep 17 00:00:00 2001 +From 8f7adbbe36757de4344cb8fa2f43284d3029a7bc Mon Sep 17 00:00:00 2001 From: heppen -Date: Tue, 20 Jun 2023 17:34:18 +0800 -Subject: [PATCH] remove dependency and adapt for build +Date: Tue, 1 Aug 2023 14:26:32 +0800 +Subject: [PATCH] remove dependency and adapt for build huks --- + bundle.json | 4 +- frameworks/crypto_lite/js/napi/BUILD.gn | 2 +- frameworks/huks_standard/main/common/BUILD.gn | 12 ++-- .../main/common/include/hks_config.h | 10 +-- @@ -41,10 +42,25 @@ Subject: [PATCH] remove dependency and adapt for build utils/file_operator/BUILD.gn | 12 ++-- utils/list/BUILD.gn | 10 +-- utils/mutex/BUILD.gn | 12 ++-- - 37 files changed, 207 insertions(+), 203 deletions(-) + 38 files changed, 210 insertions(+), 204 deletions(-) +diff --git a/bundle.json b/bundle.json +index 324383a..b261207 100644 +--- a/bundle.json ++++ b/bundle.json +@@ -69,7 +69,9 @@ + "name": "//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk", + "header": { + "header_files": [ +- "hks_api.h" ++ "hks_api.h", ++ "hks_type.h", ++ "hks_param.h" + ], + "header_base": "//base/security/huks/interfaces/innerkits/huks_standard/main/include" + } diff --git a/frameworks/crypto_lite/js/napi/BUILD.gn b/frameworks/crypto_lite/js/napi/BUILD.gn -index 5cc2e51c..fe01944b 100644 +index 5cc2e51..fe01944 100644 --- a/frameworks/crypto_lite/js/napi/BUILD.gn +++ b/frameworks/crypto_lite/js/napi/BUILD.gn @@ -17,7 +17,7 @@ import("//build/ohos.gni") @@ -57,7 +73,7 @@ index 5cc2e51c..fe01944b 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/common/BUILD.gn b/frameworks/huks_standard/main/common/BUILD.gn -index 536d4cce..bfb42775 100644 +index 536d4cc..bfb4277 100644 --- a/frameworks/huks_standard/main/common/BUILD.gn +++ b/frameworks/huks_standard/main/common/BUILD.gn @@ -21,15 +21,15 @@ config("huks_config") { @@ -83,34 +99,34 @@ index 536d4cce..bfb42775 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/common/include/hks_config.h b/frameworks/huks_standard/main/common/include/hks_config.h -index b8137e63..188b48fb 100644 +index 398f871..10847af 100644 --- a/frameworks/huks_standard/main/common/include/hks_config.h +++ b/frameworks/huks_standard/main/common/include/hks_config.h @@ -25,7 +25,7 @@ - - #define HKS_SUPPORT_API_ATTEST_KEY - --#define HKS_SUPPORT_ACCESS_TOKEN -+// #define HKS_SUPPORT_ACCESS_TOKEN - - /* AES */ - #define HKS_SUPPORT_AES_C + + #define HKS_SUPPORT_API_ATTEST_KEY + +-#define HKS_SUPPORT_ACCESS_TOKEN ++// #define HKS_SUPPORT_ACCESS_TOKEN + + /* AES */ + #define HKS_SUPPORT_AES_C @@ -220,9 +220,9 @@ - #endif - - /* Key user auth access control */ --#if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ -- defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) --#define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL --#endif -+// #if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ -+// defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) -+// #define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL -+// #endif - - #endif /* HKS_CONFIG_H */ + #endif + + /* Key user auth access control */ +-#if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ +- defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) +-#define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL +-#endif ++// #if defined(HKS_SUPPORT_HMAC_C) && defined(HKS_SUPPORT_API_GENERATE_KEY) && (defined(HKS_SUPPORT_API_IMPORT) || \ ++// defined(HKS_SUPPORT_API_GENERATE_KEY) || defined(HKS_SUPPORT_API_IMPORT_WRAPPED_KEY)) ++// #define HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL ++// #endif + + #endif /* HKS_CONFIG_H */ diff --git a/frameworks/huks_standard/main/core/BUILD.gn b/frameworks/huks_standard/main/core/BUILD.gn -index 5108a6ac..675829aa 100644 +index 5108a6a..675829a 100644 --- a/frameworks/huks_standard/main/core/BUILD.gn +++ b/frameworks/huks_standard/main/core/BUILD.gn @@ -18,11 +18,11 @@ config("huks_config") { @@ -140,7 +156,7 @@ index 5108a6ac..675829aa 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/crypto_engine/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/BUILD.gn -index 598b3fdc..a19a8fa2 100644 +index 598b3fd..a19a8fa 100644 --- a/frameworks/huks_standard/main/crypto_engine/BUILD.gn +++ b/frameworks/huks_standard/main/crypto_engine/BUILD.gn @@ -15,13 +15,13 @@ import("//base/security/huks/huks.gni") @@ -164,7 +180,7 @@ index 598b3fdc..a19a8fa2 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn -index ddd52675..47b07c86 100644 +index ddd5267..47b07c8 100644 --- a/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn +++ b/frameworks/huks_standard/main/crypto_engine/mbedtls/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -194,7 +210,7 @@ index ddd52675..47b07c86 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn -index 82e2d183..e5e7facd 100644 +index 82e2d18..e5e7fac 100644 --- a/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn +++ b/frameworks/huks_standard/main/crypto_engine/openssl/BUILD.gn @@ -19,17 +19,17 @@ config("huks_config") { @@ -222,7 +238,7 @@ index 82e2d183..e5e7facd 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/frameworks/huks_standard/main/os_dependency/BUILD.gn b/frameworks/huks_standard/main/os_dependency/BUILD.gn -index fa5d8be6..d0e4bdec 100644 +index fa5d8be..d0e4bde 100644 --- a/frameworks/huks_standard/main/os_dependency/BUILD.gn +++ b/frameworks/huks_standard/main/os_dependency/BUILD.gn @@ -21,18 +21,18 @@ config("huks_config") { @@ -251,7 +267,7 @@ index fa5d8be6..d0e4bdec 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/interfaces/innerkits/huks_standard/main/BUILD.gn b/interfaces/innerkits/huks_standard/main/BUILD.gn -index 29c855d4..42da7625 100644 +index 29c855d..42da762 100644 --- a/interfaces/innerkits/huks_standard/main/BUILD.gn +++ b/interfaces/innerkits/huks_standard/main/BUILD.gn @@ -19,17 +19,17 @@ config("huks_config") { @@ -279,7 +295,7 @@ index 29c855d4..42da7625 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/interfaces/kits/c/BUILD.gn b/interfaces/kits/c/BUILD.gn -index 0b5f6763..18f546c6 100755 +index 0b5f676..18f546c 100755 --- a/interfaces/kits/c/BUILD.gn +++ b/interfaces/kits/c/BUILD.gn @@ -38,7 +38,7 @@ config("huks_config") { @@ -292,7 +308,7 @@ index 0b5f6763..18f546c6 100755 "_HUKS_LOG_ENABLE_", ] diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn -index 64812f7b..bcd972a8 100644 +index 64812f7..bcd972a 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -14,14 +14,14 @@ @@ -317,7 +333,7 @@ index 64812f7b..bcd972a8 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/services/huks_standard/BUILD.gn b/services/huks_standard/BUILD.gn -index 9d15449c..b5d9192c 100644 +index 9d15449..b5d9192 100644 --- a/services/huks_standard/BUILD.gn +++ b/services/huks_standard/BUILD.gn @@ -21,15 +21,15 @@ ohos_prebuilt_etc("huks_service.rc") { @@ -343,7 +359,7 @@ index 9d15449c..b5d9192c 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/services/huks_standard/huks_engine/main/core/BUILD.gn b/services/huks_standard/huks_engine/main/core/BUILD.gn -index b234c6c4..c0c8e08f 100644 +index b234c6c..c0c8e08 100644 --- a/services/huks_standard/huks_engine/main/core/BUILD.gn +++ b/services/huks_standard/huks_engine/main/core/BUILD.gn @@ -19,17 +19,17 @@ config("huks_config") { @@ -371,7 +387,7 @@ index b234c6c4..c0c8e08f 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn -index d9c50406..6a765fd4 100644 +index d9c5040..6a765fd 100644 --- a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn +++ b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn @@ -18,17 +18,17 @@ config("huks_config") { @@ -407,7 +423,7 @@ index d9c50406..6a765fd4 100644 external_deps = [ "hiviewdfx_hilog_native:libhilog" ] } diff --git a/services/huks_standard/huks_service/main/BUILD.gn b/services/huks_standard/huks_service/main/BUILD.gn -index 710a937e..2ef29256 100644 +index 710a937..2ef2925 100644 --- a/services/huks_standard/huks_service/main/BUILD.gn +++ b/services/huks_standard/huks_service/main/BUILD.gn @@ -14,15 +14,15 @@ @@ -433,7 +449,7 @@ index 710a937e..2ef29256 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/services/huks_standard/huks_service/main/core/BUILD.gn b/services/huks_standard/huks_service/main/core/BUILD.gn -index 12ea145f..709dfb9b 100644 +index 12ea145..709dfb9 100644 --- a/services/huks_standard/huks_service/main/core/BUILD.gn +++ b/services/huks_standard/huks_service/main/core/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -477,7 +493,7 @@ index 12ea145f..709dfb9b 100644 ] complete_static_lib = true diff --git a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn -index d6743dce..be850e83 100644 +index d6743dc..be850e8 100644 --- a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +++ b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn @@ -21,17 +21,17 @@ config("huks_config") { @@ -516,7 +532,7 @@ index d6743dce..be850e83 100644 if (has_os_account_part) { defines += [ "HAS_OS_ACCOUNT_PART" ] diff --git a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn -index c8c27476..c1f2e207 100644 +index c8c2747..c1f2e20 100644 --- a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +++ b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn @@ -18,18 +18,18 @@ config("huks_config") { @@ -554,7 +570,7 @@ index c8c27476..c1f2e207 100644 ] diff --git a/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn -index 68efecae..66f480f4 100644 +index 68efeca..66f480f 100644 --- a/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn +++ b/services/huks_standard/huks_service/main/systemapi_mock/BUILD.gn @@ -18,11 +18,11 @@ config("libhuks_service_systemapi_mock_config") { @@ -575,7 +591,7 @@ index 68efecae..66f480f4 100644 part_name = "huks" configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn -index 84809fef..faf53319 100644 +index 84809fe..faf5331 100644 --- a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn +++ b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -605,7 +621,7 @@ index 84809fef..faf53319 100644 ] complete_static_lib = true diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp -index 2b16337e..81e4738e 100644 +index 2b16337..81e4738 100644 --- a/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp +++ b/services/huks_standard/huks_service/main/systemapi_wrap/hisysevent_wrapper/src/hisysevent_wrapper.cpp @@ -15,56 +15,57 @@ @@ -699,7 +715,7 @@ index 2b16337e..81e4738e 100644 + // return ret; } diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn -index ee9d940a..3fc2ef43 100644 +index ee9d940..3fc2ef4 100644 --- a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn +++ b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -728,7 +744,7 @@ index ee9d940a..3fc2ef43 100644 complete_static_lib = true } diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp -index 89dc408e..2872b4c2 100644 +index 89dc408..2872b4c 100644 --- a/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp +++ b/services/huks_standard/huks_service/main/systemapi_wrap/hitrace_meter_wrapper/src/hitrace_meter_wrapper.cpp @@ -16,17 +16,19 @@ @@ -757,7 +773,7 @@ index 89dc408e..2872b4c2 100644 } \ No newline at end of file diff --git a/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn b/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn -index c7b42fd1..36359b4b 100644 +index c7b42fd..36359b4 100644 --- a/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn +++ b/services/huks_standard/huks_service/main/systemapi_wrap/useridm/BUILD.gn @@ -18,17 +18,17 @@ config("huks_config") { @@ -794,7 +810,7 @@ index c7b42fd1..36359b4b 100644 external_deps = [ diff --git a/test/reliability/BUILD.gn b/test/reliability/BUILD.gn -index 5e0c4be0..26005ad8 100644 +index 5e0c4be..26005ad 100644 --- a/test/reliability/BUILD.gn +++ b/test/reliability/BUILD.gn @@ -29,7 +29,7 @@ ohos_reliabilitytest("huks_stability_test") { @@ -807,7 +823,7 @@ index 5e0c4be0..26005ad8 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/test/unittest/huks_standard_test/module_test/BUILD.gn b/test/unittest/huks_standard_test/module_test/BUILD.gn -index 72a30bb5..9bc1a0ac 100644 +index 72a30bb..9bc1a0a 100644 --- a/test/unittest/huks_standard_test/module_test/BUILD.gn +++ b/test/unittest/huks_standard_test/module_test/BUILD.gn @@ -170,7 +170,7 @@ ohos_unittest("huks_module_test") { @@ -829,7 +845,7 @@ index 72a30bb5..9bc1a0ac 100644 ] } diff --git a/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn b/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn -index 0bfdb0dd..210dc0ec 100644 +index 0bfdb0d..210dc0e 100644 --- a/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn +++ b/test/unittest/huks_standard_test/module_test/inner_kits_passthrough/BUILD.gn @@ -124,9 +124,9 @@ config("hilog_dir") { @@ -855,7 +871,7 @@ index 0bfdb0dd..210dc0ec 100644 "ipc:ipc_core", ] diff --git a/test/unittest/huks_standard_test/module_test/mock/BUILD.gn b/test/unittest/huks_standard_test/module_test/mock/BUILD.gn -index 5d80576b..c2c2a609 100644 +index 5d80576..c2c2a60 100644 --- a/test/unittest/huks_standard_test/module_test/mock/BUILD.gn +++ b/test/unittest/huks_standard_test/module_test/mock/BUILD.gn @@ -34,7 +34,7 @@ ohos_unittest("huks_mock_test") { @@ -868,7 +884,7 @@ index 5d80576b..c2c2a609 100644 ] configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] diff --git a/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn b/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn -index c670243a..6a855a55 100644 +index c670243..6a855a5 100644 --- a/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn +++ b/test/unittest/huks_standard_test/module_test/service_test/huks_service/os_dependency/idl/ipc/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("service_ipc_test") { @@ -881,7 +897,7 @@ index c670243a..6a855a55 100644 ] configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] diff --git a/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn b/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn -index 082e4d02..aaeee542 100644 +index 082e4d0..aaeee54 100644 --- a/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn +++ b/test/unittest/huks_standard_test/module_test/service_test/huks_service/systemapi_wrap/useridm_test/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("huks_useridm_wrap_test") { @@ -894,7 +910,7 @@ index 082e4d02..aaeee542 100644 ] configs = [ "//base/security/huks/frameworks/config/build:coverage_flag" ] diff --git a/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn b/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn -index c8a9b7a3..5ba8f0a9 100644 +index c8a9b7a..5ba8f0a 100644 --- a/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn +++ b/test/unittest/huks_standard_test/storage_multithread_test/BUILD.gn @@ -19,7 +19,7 @@ ohos_unittest("huks_multithread_test") { @@ -907,7 +923,7 @@ index c8a9b7a3..5ba8f0a9 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/test/unittest/huks_standard_test/three_stage_test/BUILD.gn b/test/unittest/huks_standard_test/three_stage_test/BUILD.gn -index 2ef2fa79..0395c1e9 100644 +index 2ef2fa7..0395c1e 100644 --- a/test/unittest/huks_standard_test/three_stage_test/BUILD.gn +++ b/test/unittest/huks_standard_test/three_stage_test/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("huks_UT_test") { @@ -920,7 +936,7 @@ index 2ef2fa79..0395c1e9 100644 ] diff --git a/utils/condition/BUILD.gn b/utils/condition/BUILD.gn -index da41ca08..2c8e8795 100644 +index da41ca0..2c8e879 100644 --- a/utils/condition/BUILD.gn +++ b/utils/condition/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -950,7 +966,7 @@ index da41ca08..2c8e8795 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/utils/crypto_adapter/BUILD.gn b/utils/crypto_adapter/BUILD.gn -index 381f5b82..8a067f0f 100644 +index 381f5b8..8a067f0 100644 --- a/utils/crypto_adapter/BUILD.gn +++ b/utils/crypto_adapter/BUILD.gn @@ -19,17 +19,17 @@ config("huks_config") { @@ -978,7 +994,7 @@ index 381f5b82..8a067f0f 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/utils/file_operator/BUILD.gn b/utils/file_operator/BUILD.gn -index 5864fdf3..8666d7f4 100644 +index 5864fdf..8666d7f 100644 --- a/utils/file_operator/BUILD.gn +++ b/utils/file_operator/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -1008,7 +1024,7 @@ index 5864fdf3..8666d7f4 100644 "_HUKS_LOG_ENABLE_", ] diff --git a/utils/list/BUILD.gn b/utils/list/BUILD.gn -index ba8d1492..95c65d59 100644 +index ba8d149..95c65d5 100644 --- a/utils/list/BUILD.gn +++ b/utils/list/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { @@ -1029,7 +1045,7 @@ index ba8d1492..95c65d59 100644 part_name = "huks" public_configs = [ ":huks_config" ] diff --git a/utils/mutex/BUILD.gn b/utils/mutex/BUILD.gn -index f4db2132..94b5a904 100644 +index f4db213..94b5a90 100644 --- a/utils/mutex/BUILD.gn +++ b/utils/mutex/BUILD.gn @@ -19,11 +19,11 @@ config("huks_config") { diff --git a/distributed-utils.spec b/distributed-utils.spec index 2c2632e52269255a294ff8bf33daaa62fe44950d..81073fc490aa297727e28b5b2054fd279b18fb9f 100644 --- a/distributed-utils.spec +++ b/distributed-utils.spec @@ -23,7 +23,7 @@ Name: distributed-utils Version: 1.0.0 -Release: 3 +Release: 4 Summary: Distributed middleware used components. License: Apache-2.0 and MIT Url: https://gitee.com/openharmony/ @@ -170,8 +170,9 @@ done for a_file in $(find ./ -name *.a -type f) do cp ${a_file} %{buildroot}/system/lib64 - cp ${so_file} %{buildroot}/usr/lib64 + cp ${a_file} %{buildroot}/usr/lib64 done +rm -rf %{buildroot}/usr/lib64/libhilog_base.a popd # copy executable file. @@ -183,6 +184,7 @@ pushd %{_builddir}/${header_out_path} find c_utils -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/c_utils find config_policy -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/config_policy find dsoftbus -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/dsoftbus +cp -f %{dsoftbus_dir}/interfaces/kits/common/softbus_error_code.h %{buildroot}%{_includedir}/dsoftbus/ find eventhandler -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/eventhandler find init -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/init find ipc -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/ipc @@ -195,6 +197,9 @@ find dataclassification -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}% find device_security_level -name *.h -print0 | xargs -0 -i cp -rvf {} %{buildroot}%{_includedir}/device_security_level popd +sed -i 's/\"..\/src\/event_reactor.h\"//g' %{buildroot}%{_includedir}/c_utils/timer.h +cp -f %{c_utils_dir}/base/src/event_reactor.h %{buildroot}%{_includedir}/c_utils + # copy nlohmann_json header file to includedir. cd %{json_dir} cp -rvf include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json @@ -208,9 +213,14 @@ cp -rvf single_include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json/single /usr/bin/* %changelog +* Wed Jul 26 2023 Ge Wang - 1.0.0-4 +- add deficient component. + * Tue Jun 27 2023 Peng He - 1.0.0-3 - increase the softbus pthread stack size on x86 and other env. + * Sun Jun 25 2023 Peng He - 1.0.0-2 - add missed libs of device_manager. + * Tue Jun 20 2023 Peng He - 1.0.0-1 - add components used by distributed middleware. diff --git a/security_huks-OpenHarmony-v3.2-Release.tar.gz b/security_huks-OpenHarmony-v3.2-Release.tar.gz index 1a4ba6a30c2b52de55d1a009fa23e3bc807e4409..312e3b5d4bd5311d9e0c9c637f940002c3de4d45 100644 Binary files a/security_huks-OpenHarmony-v3.2-Release.tar.gz and b/security_huks-OpenHarmony-v3.2-Release.tar.gz differ