diff --git a/BUILD.gn b/BUILD.gn index 278ada686ae2e6719cc9bba20e5c3b1602ecad34..6f64f71fbf92c16e59929fe3e5b57b5ae591fba4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos/sa_profile/sa_profile.gni") import("code_signature.gni") config("common_public_config") { - include_dirs = [ "interfaces/innerkits/common/include" ] + include_dirs = [ "interfaces/inner_api/common/include" ] } config("common_utils_config") { @@ -25,10 +25,10 @@ config("common_utils_config") { group("subcomponents") { deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign:libjit_code_sign", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign:libjit_code_sign", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk", "${code_signature_root_dir}/services/local_code_sign:liblocal_code_sign", "${code_signature_root_dir}/services/local_code_sign:local_code_sign_configs", ] diff --git a/README.md b/README.md index 3ddba11ec37968cbb5f8315859fc4a80b9e81bdd..cb55e4c7daf6818f138b85b331cf02e690059f59 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The code signature component provides the following functions: ``` /base/security/code_signature ├── interfaces # Interface layer -│ └── innerkits # +│ └── inner_api # │ ├── code_sign_attr_utils # APIs for setting code signing attributes │ ├── code_sign_utils # APIs for enabling code signing │ ├── common # Common basic capacities diff --git a/README_zh.md b/README_zh.md index aaa6d986983fd2033fa72f6f9c2de6e17ba1d86b..d49e2f596f2f7a0d9186103d66b46c53e9ab8da6 100644 --- a/README_zh.md +++ b/README_zh.md @@ -21,7 +21,7 @@ ``` /base/security/code_signature ├── interfaces # 接口层 -│ └── innerkits # +│ └── inner_api # │ ├── code_sign_attr_utils # 属性设置接口 │ ├── code_sign_utils # 使能接口 │ ├── common # 公共基础能力 diff --git a/bundle.json b/bundle.json index 21663e031b5f79c63810f5baf4b594de6339ba96..b599c18f7e0771de57f7ef90156b6c283f6b8271 100644 --- a/bundle.json +++ b/bundle.json @@ -56,31 +56,43 @@ ], "inner_kits": [ { - "name" : "//base/security/code_signature/interfaces/innerkits/code_sign_utils:libcode_sign_utils", + "name" : "//base/security/code_signature/interfaces/inner_api/code_sign_utils:libcode_sign_utils", "header": { - "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/code_sign_utils/include" + "header_files": [ + "code_sign_utils.h", + "code_sign_utils_in_c.h" + ], + "header_base": "//base/security/code_signature/interfaces/inner_api/code_sign_utils/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "name" : "//base/security/code_signature/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk", "header": { - "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/local_code_sign/include" + "header_files": [ + "local_code_sign_kit.h" + ], + "header_base": "//base/security/code_signature/interfaces/inner_api/local_code_sign/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", + "name" : "//base/security/code_signature/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", "header": { - "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/code_sign_attr_utils/include" + "header_files": [ + "code_sign_attr_utils.h" + ], + "header_base": "//base/security/code_signature/interfaces/inner_api/code_sign_attr_utils/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/jit_code_sign:libjit_code_sign", + "name" : "//base/security/code_signature/interfaces/inner_api/jit_code_sign:libjit_code_sign", "header": { - "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/jit_code_sign/include" + "header_files": [ + "jit_buffer_integrity.h", + "jit_code_signer_base.h", + "jit_code_signer_factory.h", + "jit_fort_helper.h" + ], + "header_base": "//base/security/code_signature/interfaces/inner_api/jit_code_sign/include" } } ], diff --git a/interfaces/innerkits/code_sign_attr_utils/BUILD.gn b/interfaces/inner_api/code_sign_attr_utils/BUILD.gn similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/BUILD.gn rename to interfaces/inner_api/code_sign_attr_utils/BUILD.gn diff --git a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h b/interfaces/inner_api/code_sign_attr_utils/include/code_sign_attr_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h rename to interfaces/inner_api/code_sign_attr_utils/include/code_sign_attr_utils.h diff --git a/interfaces/innerkits/code_sign_attr_utils/include/ownerid_utils.h b/interfaces/inner_api/code_sign_attr_utils/include/ownerid_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/include/ownerid_utils.h rename to interfaces/inner_api/code_sign_attr_utils/include/ownerid_utils.h diff --git a/interfaces/innerkits/code_sign_attr_utils/src/code_sign_attr_utils.c b/interfaces/inner_api/code_sign_attr_utils/src/code_sign_attr_utils.c similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/src/code_sign_attr_utils.c rename to interfaces/inner_api/code_sign_attr_utils/src/code_sign_attr_utils.c diff --git a/interfaces/innerkits/code_sign_attr_utils/src/ownerid_utils.cpp b/interfaces/inner_api/code_sign_attr_utils/src/ownerid_utils.cpp similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/src/ownerid_utils.cpp rename to interfaces/inner_api/code_sign_attr_utils/src/ownerid_utils.cpp diff --git a/interfaces/innerkits/code_sign_utils/BUILD.gn b/interfaces/inner_api/code_sign_utils/BUILD.gn similarity index 100% rename from interfaces/innerkits/code_sign_utils/BUILD.gn rename to interfaces/inner_api/code_sign_utils/BUILD.gn diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_enable_multi_task.h b/interfaces/inner_api/code_sign_utils/include/code_sign_enable_multi_task.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_enable_multi_task.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_enable_multi_task.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_helper.h b/interfaces/inner_api/code_sign_utils/include/code_sign_helper.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_helper.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_helper.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_utils.h b/interfaces/inner_api/code_sign_utils/include/code_sign_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_utils.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_utils.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_utils_in_c.h b/interfaces/inner_api/code_sign_utils/include/code_sign_utils_in_c.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_utils_in_c.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_utils_in_c.h diff --git a/interfaces/innerkits/code_sign_utils/include/constants.h b/interfaces/inner_api/code_sign_utils/include/constants.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/constants.h rename to interfaces/inner_api/code_sign_utils/include/constants.h diff --git a/interfaces/innerkits/code_sign_utils/include/stat_utils.h b/interfaces/inner_api/code_sign_utils/include/stat_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/stat_utils.h rename to interfaces/inner_api/code_sign_utils/include/stat_utils.h diff --git a/interfaces/innerkits/code_sign_utils/libcode_sign_utils.versionscript b/interfaces/inner_api/code_sign_utils/libcode_sign_utils.versionscript similarity index 100% rename from interfaces/innerkits/code_sign_utils/libcode_sign_utils.versionscript rename to interfaces/inner_api/code_sign_utils/libcode_sign_utils.versionscript diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_enable_multi_task.cpp b/interfaces/inner_api/code_sign_utils/src/code_sign_enable_multi_task.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_enable_multi_task.cpp rename to interfaces/inner_api/code_sign_utils/src/code_sign_enable_multi_task.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_helper.cpp b/interfaces/inner_api/code_sign_utils/src/code_sign_helper.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_helper.cpp rename to interfaces/inner_api/code_sign_utils/src/code_sign_helper.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp b/interfaces/inner_api/code_sign_utils/src/code_sign_utils.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp rename to interfaces/inner_api/code_sign_utils/src/code_sign_utils.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils_in_c.cpp b/interfaces/inner_api/code_sign_utils/src/code_sign_utils_in_c.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_utils_in_c.cpp rename to interfaces/inner_api/code_sign_utils/src/code_sign_utils_in_c.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/stat_utils.cpp b/interfaces/inner_api/code_sign_utils/src/stat_utils.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/stat_utils.cpp rename to interfaces/inner_api/code_sign_utils/src/stat_utils.cpp diff --git a/interfaces/innerkits/common/include/byte_buffer.h b/interfaces/inner_api/common/include/byte_buffer.h similarity index 100% rename from interfaces/innerkits/common/include/byte_buffer.h rename to interfaces/inner_api/common/include/byte_buffer.h diff --git a/interfaces/innerkits/common/include/errcode.h b/interfaces/inner_api/common/include/errcode.h similarity index 100% rename from interfaces/innerkits/common/include/errcode.h rename to interfaces/inner_api/common/include/errcode.h diff --git a/interfaces/innerkits/jit_code_sign/BUILD.gn b/interfaces/inner_api/jit_code_sign/BUILD.gn similarity index 100% rename from interfaces/innerkits/jit_code_sign/BUILD.gn rename to interfaces/inner_api/jit_code_sign/BUILD.gn diff --git a/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h b/interfaces/inner_api/jit_code_sign/include/jit_buffer_integrity.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h rename to interfaces/inner_api/jit_code_sign/include/jit_buffer_integrity.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_base.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_base.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_factory.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_factory.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_factory.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_factory.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_hybrid.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_hybrid.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_hybrid.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_hybrid.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_single.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_single.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_single.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_single.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h b/interfaces/inner_api/jit_code_sign/include/jit_fort_helper.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h rename to interfaces/inner_api/jit_code_sign/include/jit_fort_helper.h diff --git a/interfaces/innerkits/jit_code_sign/include/pac_sign_ctx.h b/interfaces/inner_api/jit_code_sign/include/pac_sign_ctx.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/pac_sign_ctx.h rename to interfaces/inner_api/jit_code_sign/include/pac_sign_ctx.h diff --git a/interfaces/innerkits/jit_code_sign/include/random_helper.h b/interfaces/inner_api/jit_code_sign/include/random_helper.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/random_helper.h rename to interfaces/inner_api/jit_code_sign/include/random_helper.h diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp b/interfaces/inner_api/jit_code_sign/src/jit_code_signer_base.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp rename to interfaces/inner_api/jit_code_sign/src/jit_code_signer_base.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_factory.cpp b/interfaces/inner_api/jit_code_sign/src/jit_code_signer_factory.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_factory.cpp rename to interfaces/inner_api/jit_code_sign/src/jit_code_signer_factory.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp b/interfaces/inner_api/jit_code_sign/src/jit_code_signer_hybrid.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp rename to interfaces/inner_api/jit_code_sign/src/jit_code_signer_hybrid.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp b/interfaces/inner_api/jit_code_sign/src/jit_code_signer_single.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp rename to interfaces/inner_api/jit_code_sign/src/jit_code_signer_single.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/pac_sign_ctx.cpp b/interfaces/inner_api/jit_code_sign/src/pac_sign_ctx.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/pac_sign_ctx.cpp rename to interfaces/inner_api/jit_code_sign/src/pac_sign_ctx.cpp diff --git a/interfaces/innerkits/local_code_sign/BUILD.gn b/interfaces/inner_api/local_code_sign/BUILD.gn similarity index 100% rename from interfaces/innerkits/local_code_sign/BUILD.gn rename to interfaces/inner_api/local_code_sign/BUILD.gn diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_client.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_client.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_client.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_interface.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_interface.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_ipc_interface_code.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_ipc_interface_code.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_ipc_interface_code.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_ipc_interface_code.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_kit.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_kit.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_kit.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_kit.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_load_callback.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_load_callback.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_load_callback.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_load_callback.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_proxy.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_proxy.h diff --git a/interfaces/innerkits/local_code_sign/liblocal_code_sign_sdk.versionscript b/interfaces/inner_api/local_code_sign/liblocal_code_sign_sdk.versionscript similarity index 100% rename from interfaces/innerkits/local_code_sign/liblocal_code_sign_sdk.versionscript rename to interfaces/inner_api/local_code_sign/liblocal_code_sign_sdk.versionscript diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp b/interfaces/inner_api/local_code_sign/src/local_code_sign_client.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp rename to interfaces/inner_api/local_code_sign/src/local_code_sign_client.cpp diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_kit.cpp b/interfaces/inner_api/local_code_sign/src/local_code_sign_kit.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_kit.cpp rename to interfaces/inner_api/local_code_sign/src/local_code_sign_kit.cpp diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_load_callback.cpp b/interfaces/inner_api/local_code_sign/src/local_code_sign_load_callback.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_load_callback.cpp rename to interfaces/inner_api/local_code_sign/src/local_code_sign_load_callback.cpp diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_proxy.cpp b/interfaces/inner_api/local_code_sign/src/local_code_sign_proxy.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_proxy.cpp rename to interfaces/inner_api/local_code_sign/src/local_code_sign_proxy.cpp diff --git a/services/key_enable/utils/BUILD.gn b/services/key_enable/utils/BUILD.gn index 68fad0fbc50811978032c3152278584e8712278e..0dece6e41dd52ae680e3c62a80751b17e09c6ad2 100644 --- a/services/key_enable/utils/BUILD.gn +++ b/services/key_enable/utils/BUILD.gn @@ -24,10 +24,10 @@ ohos_static_library("libkey_enable_utils") { ] include_dirs = [ "include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk" ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] configs = [ "${code_signature_root_dir}:common_utils_config" ] diff --git a/services/local_code_sign/BUILD.gn b/services/local_code_sign/BUILD.gn index 1672a9df91a3554169862aa38ec8b7732f4b1aea..6a4eb3ee704f2185e4424fcf06a6a029569168b4 100644 --- a/services/local_code_sign/BUILD.gn +++ b/services/local_code_sign/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("liblocal_code_sign") { ] include_dirs = [ "include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] shlib_type = "sa" diff --git a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn index 3d6b295a1ceb6c5b563acbf6ddafc4562677eeb6..01f91e7e125c29e9ec05828787eb4b1d771b648b 100644 --- a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn +++ b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn @@ -26,10 +26,10 @@ ohos_fuzztest("InitLocalCertificateStubFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", ] external_deps = [ @@ -47,7 +47,7 @@ ohos_fuzztest("InitLocalCertificateStubFuzzTest") { ] include_dirs += [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] diff --git a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn index e3043d66516aafe68e37b34f15ccf123db8e1bd3..edfed5f03821b91483f7cd13051aa6b49fd5f313 100644 --- a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn +++ b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn @@ -26,10 +26,10 @@ ohos_fuzztest("SignLocalCodeStubFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", ] external_deps = [ @@ -47,7 +47,7 @@ ohos_fuzztest("SignLocalCodeStubFuzzTest") { ] include_dirs += [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 3da8fb1a3649bc43f5fc39cbc309bbd2b5e7a38e..d71d8229ca90493bde3d1db0331d6af33561dc7b 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -61,7 +61,7 @@ ohos_unittest("code_sign_utils_unittest") { deps = [ ":key_enable_src_set", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils", ] defines = [] @@ -74,7 +74,7 @@ ohos_unittest("code_sign_utils_unittest") { include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", "${code_signature_root_dir}/utils/include", ] @@ -89,11 +89,11 @@ ohos_unittest("code_sign_attr_utils_unittest") { module_out_path = "security/code_signature" sources = [ "code_sign_attr_utils_test.cpp" ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils" ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/common/include", + "${code_signature_root_dir}/interfaces/inner_api/common/include", "${code_signature_root_dir}/utils/include", ] @@ -108,10 +108,10 @@ ohos_unittest("code_sign_utils_in_c_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "code_sign_utils_in_c_test.cpp" ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", "${code_signature_root_dir}/utils/include", ] @@ -132,15 +132,15 @@ ohos_unittest("local_code_sign_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "local_code_sign_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -166,7 +166,7 @@ ohos_unittest("local_code_sign_utils_unittest") { "mock/src/hks_api.cpp", "mock/src/hks_api_mock_helper.cpp", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ "mock/include", @@ -195,7 +195,7 @@ ohos_unittest("local_code_sign_utils_mock_unittest") { "mock/src/hks_api_mock_helper.cpp", "mock/src/hks_api_mock_test.cpp", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ "mock/include", @@ -220,15 +220,15 @@ ohos_unittest("sign_and_enforce_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "sign_and_enforce_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -249,15 +249,15 @@ ohos_unittest("multi_thread_local_sign_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "multi_thread_local_sign_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -330,7 +330,7 @@ ohos_unittest("enable_verity_ioctl_unittest") { ] deps = [ ":key_enable_src_set", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", "${selinux_dir}:libselinux", ] external_deps = [ @@ -342,7 +342,7 @@ ohos_unittest("enable_verity_ioctl_unittest") { ohos_unittest("jit_code_sign_unittest") { module_out_path = "security/code_signature" include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign/include", ] sources = [ "jit_code_sign_test.cpp" ] sanitize = { @@ -351,8 +351,8 @@ ohos_unittest("jit_code_sign_unittest") { debug = false } deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign:libjit_code_sign", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign:libjit_code_sign", ] external_deps = [ "c_utils:utils",