From 04e7bbaabb86bae1bbfccb99a7171b1ca142fc55 Mon Sep 17 00:00:00 2001 From: yang1946 Date: Wed, 31 Jan 2024 11:11:16 +0800 Subject: [PATCH] =?UTF-8?q?key=5Fenable.cfg=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang1946 --- services/key_enable/BUILD.gn | 4 ++-- .../key_enable.cfg} | 0 .../key_enable.cfg} | 0 test/unittest/code_sign_utils_test.cpp | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename services/key_enable/cfg/{key_enable.disable_xpm.cfg => disable_xpm/key_enable.cfg} (100%) rename services/key_enable/cfg/{key_enable.enable_xpm.cfg => enable_xpm/key_enable.cfg} (100%) diff --git a/services/key_enable/BUILD.gn b/services/key_enable/BUILD.gn index 5f9c91e..e071f4e 100644 --- a/services/key_enable/BUILD.gn +++ b/services/key_enable/BUILD.gn @@ -83,9 +83,9 @@ ohos_prebuilt_etc("trusted_cert_path_test") { ohos_prebuilt_etc("key_enable.cfg") { if (code_signature_enable_xpm_mode) { - source = "cfg/key_enable.enable_xpm.cfg" + source = "cfg/enable_xpm/key_enable.cfg" } else { - source = "cfg/key_enable.disable_xpm.cfg" + source = "cfg/disable_xpm/key_enable.cfg" } relative_install_dir = "init" subsystem_name = "security" diff --git a/services/key_enable/cfg/key_enable.disable_xpm.cfg b/services/key_enable/cfg/disable_xpm/key_enable.cfg similarity index 100% rename from services/key_enable/cfg/key_enable.disable_xpm.cfg rename to services/key_enable/cfg/disable_xpm/key_enable.cfg diff --git a/services/key_enable/cfg/key_enable.enable_xpm.cfg b/services/key_enable/cfg/enable_xpm/key_enable.cfg similarity index 100% rename from services/key_enable/cfg/key_enable.enable_xpm.cfg rename to services/key_enable/cfg/enable_xpm/key_enable.cfg diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp index 97f25aa..2ab611e 100644 --- a/test/unittest/code_sign_utils_test.cpp +++ b/test/unittest/code_sign_utils_test.cpp @@ -619,7 +619,7 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0023, TestSize.Level0) std::string moduleName = "EntryAbility"; EntryMap entryMap; - std::string filePath1("libs/arm64-v8a/code_sign_block/libc++_shared.so"); + std::string filePath1("libs/arm64-v8a/libc++_shared.so"); std::string targetPath1 = APP_BASE_PATH + "/demo_with_multi_lib/libs/arm64-v8a/code_sign_block/libc++_shared.so"; entryMap.emplace(filePath1, targetPath1); @@ -627,7 +627,7 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0023, TestSize.Level0) int32_t ret = utils.EnforceCodeSignForApp(hapRealPath, entryMap, FILE_ENTRY_ONLY, moduleName); EXPECT_EQ(ret, CS_SUCCESS); - std::string filePath2("libs/arm64-v8a/code_sign_block/libentry.so"); + std::string filePath2("libs/arm64-v8a/libentry.so"); std::string targetPath2 = APP_BASE_PATH + "/demo_with_multi_lib/libs/arm64-v8a/code_sign_block/libentry.so"; entryMap.emplace(filePath2, targetPath2); @@ -690,10 +690,10 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0026, TestSize.Level0) std::string hapRealPath2 = APP_BASE_PATH + "/demo_with_multi_lib/entry-default-signed-release.hap"; std::string hapRealPath3 = APP_BASE_PATH + "/demo_with_multi_lib/entry-default-signed-debug.hap"; - std::string filePath1("libs/arm64-v8a/code_sign_block/libc++_shared.so"); + std::string filePath1("libs/arm64-v8a/libc++_shared.so"); std::string targetPath1 = APP_BASE_PATH + "/demo_with_multi_lib/libs/arm64-v8a/code_sign_block/libc++_shared.so"; entryMap.emplace(filePath1, targetPath1); - std::string filePath2("libs/arm64-v8a/code_sign_block/libentry.so"); + std::string filePath2("libs/arm64-v8a/libentry.so"); std::string targetPath2 = APP_BASE_PATH + "/demo_with_multi_lib/libs/arm64-v8a/code_sign_block/libentry.so"; entryMap.emplace(filePath2, targetPath2); -- Gitee