From ca69acc7ad75c339d51e74e038ab7cb167e7cac2 Mon Sep 17 00:00:00 2001 From: Cai Xincheng Date: Mon, 21 Oct 2024 16:20:55 +0800 Subject: [PATCH] change inner_api to inner_kits Signed-off-by: Cai Xincheng Change-Id: Ic77e797b5a7303d9cd7391eee7020ffab31c8e4f --- BUILD.gn | 4 +-- Cargo.toml | 4 +-- README.md | 3 ++- README_zh.md | 3 ++- bundle.json | 8 +++--- .../c => frameworks/c/system_api}/BUILD.gn | 20 +++----------- .../c/system_api}/src/asset_system_api.c | 0 frameworks/js/napi/BUILD.gn | 2 +- interfaces/inner_kits/c/BUILD.gn | 26 +++++++++++++++++++ .../{inner_api => inner_kits}/c/Cargo.toml | 0 .../c/inc/asset_system_api.h | 0 .../c/inc/asset_system_type.h | 0 .../{inner_api => inner_kits}/c/src/lib.rs | 0 .../{inner_api => inner_kits}/rs/BUILD.gn | 0 .../{inner_api => inner_kits}/rs/Cargo.toml | 0 .../{inner_api => inner_kits}/rs/src/lib.rs | 0 .../rs/src/plugin_interface.rs | 0 interfaces/kits/c/BUILD.gn | 2 +- services/core_service/BUILD.gn | 2 +- services/core_service/Cargo.toml | 2 +- .../core_service/src/common_event/listener.rs | 4 +-- .../src/common_event/start_event.rs | 3 ++- services/core_service/src/lib.rs | 2 -- services/plugin/BUILD.gn | 2 +- services/plugin/Cargo.toml | 2 +- test/unittest/common/BUILD.gn | 4 +-- .../BUILD.gn | 2 +- .../Cargo.toml | 2 +- .../src/add.rs | 0 .../src/add_abnormal.rs | 0 .../src/common.rs | 0 .../src/main.rs | 0 .../src/post_query.rs | 0 .../src/post_query_abnormal.rs | 0 .../src/pre_query.rs | 0 .../src/pre_query_abnormal.rs | 0 .../src/query.rs | 0 .../src/query_abnormal.rs | 0 .../src/remove.rs | 0 .../src/remove_abnormal.rs | 0 .../src/update.rs | 0 .../src/update_abnormal.rs | 0 test/unittest/kits_ndk/BUILD.gn | 4 +-- test/unittest/module_test/BUILD.gn | 4 +-- 44 files changed, 60 insertions(+), 45 deletions(-) rename {interfaces/inner_api/c => frameworks/c/system_api}/BUILD.gn (70%) mode change 100755 => 100644 rename {interfaces/inner_api/c => frameworks/c/system_api}/src/asset_system_api.c (100%) mode change 100755 => 100644 create mode 100755 interfaces/inner_kits/c/BUILD.gn rename interfaces/{inner_api => inner_kits}/c/Cargo.toml (100%) rename interfaces/{inner_api => inner_kits}/c/inc/asset_system_api.h (100%) rename interfaces/{inner_api => inner_kits}/c/inc/asset_system_type.h (100%) rename interfaces/{inner_api => inner_kits}/c/src/lib.rs (100%) rename interfaces/{inner_api => inner_kits}/rs/BUILD.gn (100%) rename interfaces/{inner_api => inner_kits}/rs/Cargo.toml (100%) rename interfaces/{inner_api => inner_kits}/rs/src/lib.rs (100%) rename interfaces/{inner_api => inner_kits}/rs/src/plugin_interface.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/BUILD.gn (93%) rename test/unittest/{inner_api_rust => inner_kits_rust}/Cargo.toml (92%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/add.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/add_abnormal.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/common.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/main.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/post_query.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/post_query_abnormal.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/pre_query.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/pre_query_abnormal.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/query.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/query_abnormal.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/remove.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/remove_abnormal.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/update.rs (100%) rename test/unittest/{inner_api_rust => inner_kits_rust}/src/update_abnormal.rs (100%) diff --git a/BUILD.gn b/BUILD.gn index efc0c09..996d5a5 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") group("asset_component") { deps = [ - "interfaces/inner_api/rs:asset_sdk_rust", + "interfaces/inner_kits/rs:asset_sdk_rust", "interfaces/kits/c:asset_ndk", "sa_profile:asset_sa_profiles", "services/core_service:asset_service", @@ -36,7 +36,7 @@ group("asset_bin_test") { "test/unittest/module_test:asset_dependency_test", ] if (enable_local_test) { - deps += [ "test/unittest/inner_api_rust:asset_rust_test" ] + deps += [ "test/unittest/inner_kits_rust:asset_rust_test" ] deps += [ "test/unittest/module_test:asset_module_test" ] deps += [ "services/common:asset_calling_info_test" ] deps += [ "services/db_operator:asset_db_operator_test" ] diff --git a/Cargo.toml b/Cargo.toml index c4a8dfe..8f86e1b 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,12 +17,12 @@ members = [ "frameworks/ipc", "frameworks/os_dependency/log", "frameworks/utils", - "interfaces/inner_api/c", + "interfaces/inner_kits/c", "services/common", "services/core_service", "services/crypto_manager", "services/db_operator", "services/db_key_operator", - "test/unittest/inner_api_rust", + "test/unittest/inner_kits_rust", "test/unittest/module_test" ] diff --git a/README.md b/README.md index 442aec2..db387ff 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,14 @@ With the APIs provided by ASSET, you can quickly integrate system-wide encrypted ```bash ├── frameworks # Framework code +│ ├── c # Code for interaction between C and Rust │ ├── definition # Definitions of common data types │ ├── ipc # IPC APIs │ ├── js # Code for interaction between JS and C/C++ │ ├── os_dependency # Adaptation of universal system capabilities │ └── utils # Utility APIs ├── interfaces # APIs exposed externally -│ ├── inner_api # APIs for system abilities (SAs) +│ ├── inner_kits # APIs for system abilities (SAs) │ └── kits # APIs for user applications ├── sa_profile # SA profiles └── services # Service layer code diff --git a/README_zh.md b/README_zh.md index 0a1dcf4..24b1983 100755 --- a/README_zh.md +++ b/README_zh.md @@ -25,13 +25,14 @@ ```bash ├── frameworks # 框架层代码 +│ ├── c # C-Rust交互模块 │ ├── definition # 通用数据类型定义 │ ├── ipc # IPC接口定义 │ ├── js # JS-C/C++交互模块 │ ├── os_dependency # 通用系统能力适配模块 │ └── utils # 工具方法 ├── interfaces # 对外提供的接口 -│ ├── inner_api # 提供给系统服务调用的接口 +│ ├── inner_kits # 提供给系统服务调用的接口 │ └── kits # 提供给应用调用的接口 ├── sa_profile # 系统服务配置文件 └── services # 服务层代码 diff --git a/bundle.json b/bundle.json index 7fd5448..7b81e0f 100755 --- a/bundle.json +++ b/bundle.json @@ -56,22 +56,22 @@ "//base/security/asset:asset_component" ] }, - "inner_api": [ + "inner_kits": [ { - "name": "//base/security/asset/interfaces/inner_api/rs:asset_sdk_rust", + "name": "//base/security/asset/interfaces/inner_kits/rs:asset_sdk_rust", "header": { "header_files": [], "header_base": [] } }, { - "name": "//base/security/asset/interfaces/inner_api/c:asset_sdk", + "name": "//base/security/asset/frameworks/c/system_api:asset_sdk", "header": { "header_files": [ "asset_system_api.h", "asset_system_type.h" ], - "header_base": "//base/security/asset/interfaces/inner_api/c/inc" + "header_base": "//base/security/asset/interfaces/inner_kits/c/inc" } } ], diff --git a/interfaces/inner_api/c/BUILD.gn b/frameworks/c/system_api/BUILD.gn old mode 100755 new mode 100644 similarity index 70% rename from interfaces/inner_api/c/BUILD.gn rename to frameworks/c/system_api/BUILD.gn index d3af5c7..0124f0d --- a/interfaces/inner_api/c/BUILD.gn +++ b/frameworks/c/system_api/BUILD.gn @@ -14,16 +14,16 @@ import("//build/ohos.gni") config("asset_config") { - include_dirs = [ "inc" ] + include_dirs = [ "../../../interfaces/inner_kits/c/inc" ] } ohos_shared_library("asset_sdk") { public_configs = [ ":asset_config" ] sources = [ "src/asset_system_api.c" ] deps = [ - ":asset_sdk_ffi", - "../../../frameworks/os_dependency/log:asset_log", - "../../../frameworks/os_dependency/memory:asset_mem", + "../../../interfaces/inner_kits/c:asset_sdk_ffi", + "../../os_dependency/log:asset_log", + "../../os_dependency/memory:asset_mem", ] external_deps = [ @@ -49,15 +49,3 @@ ohos_shared_library("asset_sdk") { subsystem_name = "security" part_name = "asset" } - -ohos_rust_shared_ffi("asset_sdk_ffi") { - sources = [ "src/lib.rs" ] - deps = [ - "../../../frameworks/os_dependency/log:asset_log", - "../../../frameworks/os_dependency/memory:asset_mem", - "../rs:asset_sdk_rust", - ] - crate_name = "asset_sdk_ffi" - subsystem_name = "security" - part_name = "asset" -} diff --git a/interfaces/inner_api/c/src/asset_system_api.c b/frameworks/c/system_api/src/asset_system_api.c old mode 100755 new mode 100644 similarity index 100% rename from interfaces/inner_api/c/src/asset_system_api.c rename to frameworks/c/system_api/src/asset_system_api.c diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 730136e..a3980b2 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("asset_napi") { ] deps = [ - "../../../interfaces/inner_api/c:asset_sdk", + "../../c/system_api:asset_sdk", "../../os_dependency/memory:asset_mem", ] diff --git a/interfaces/inner_kits/c/BUILD.gn b/interfaces/inner_kits/c/BUILD.gn new file mode 100755 index 0000000..62150c7 --- /dev/null +++ b/interfaces/inner_kits/c/BUILD.gn @@ -0,0 +1,26 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +ohos_rust_shared_ffi("asset_sdk_ffi") { + sources = [ "src/lib.rs" ] + deps = [ + "../../../frameworks/os_dependency/log:asset_log", + "../../../frameworks/os_dependency/memory:asset_mem", + "../rs:asset_sdk_rust", + ] + crate_name = "asset_sdk_ffi" + subsystem_name = "security" + part_name = "asset" +} diff --git a/interfaces/inner_api/c/Cargo.toml b/interfaces/inner_kits/c/Cargo.toml similarity index 100% rename from interfaces/inner_api/c/Cargo.toml rename to interfaces/inner_kits/c/Cargo.toml diff --git a/interfaces/inner_api/c/inc/asset_system_api.h b/interfaces/inner_kits/c/inc/asset_system_api.h similarity index 100% rename from interfaces/inner_api/c/inc/asset_system_api.h rename to interfaces/inner_kits/c/inc/asset_system_api.h diff --git a/interfaces/inner_api/c/inc/asset_system_type.h b/interfaces/inner_kits/c/inc/asset_system_type.h similarity index 100% rename from interfaces/inner_api/c/inc/asset_system_type.h rename to interfaces/inner_kits/c/inc/asset_system_type.h diff --git a/interfaces/inner_api/c/src/lib.rs b/interfaces/inner_kits/c/src/lib.rs similarity index 100% rename from interfaces/inner_api/c/src/lib.rs rename to interfaces/inner_kits/c/src/lib.rs diff --git a/interfaces/inner_api/rs/BUILD.gn b/interfaces/inner_kits/rs/BUILD.gn similarity index 100% rename from interfaces/inner_api/rs/BUILD.gn rename to interfaces/inner_kits/rs/BUILD.gn diff --git a/interfaces/inner_api/rs/Cargo.toml b/interfaces/inner_kits/rs/Cargo.toml similarity index 100% rename from interfaces/inner_api/rs/Cargo.toml rename to interfaces/inner_kits/rs/Cargo.toml diff --git a/interfaces/inner_api/rs/src/lib.rs b/interfaces/inner_kits/rs/src/lib.rs similarity index 100% rename from interfaces/inner_api/rs/src/lib.rs rename to interfaces/inner_kits/rs/src/lib.rs diff --git a/interfaces/inner_api/rs/src/plugin_interface.rs b/interfaces/inner_kits/rs/src/plugin_interface.rs similarity index 100% rename from interfaces/inner_api/rs/src/plugin_interface.rs rename to interfaces/inner_kits/rs/src/plugin_interface.rs diff --git a/interfaces/kits/c/BUILD.gn b/interfaces/kits/c/BUILD.gn index 61ca9dc..171749c 100755 --- a/interfaces/kits/c/BUILD.gn +++ b/interfaces/kits/c/BUILD.gn @@ -20,7 +20,7 @@ config("asset_config") { ohos_shared_library("asset_ndk") { public_configs = [ ":asset_config" ] sources = [ "src/asset_api.c" ] - deps = [ "../../inner_api/c:asset_sdk" ] + deps = [ "../../../frameworks/c/system_api:asset_sdk" ] external_deps = [ "hilog:libhilog" ] diff --git a/services/core_service/BUILD.gn b/services/core_service/BUILD.gn index 66ab6fc..2fde58c 100755 --- a/services/core_service/BUILD.gn +++ b/services/core_service/BUILD.gn @@ -22,7 +22,7 @@ ohos_rust_shared_library("asset_service") { "../../frameworks/os_dependency/file:asset_file_operator", "../../frameworks/os_dependency/log:asset_log", "../../frameworks/utils:asset_utils", - "../../interfaces/inner_api/rs:asset_sdk_rust", + "../../interfaces/inner_kits/rs:asset_sdk_rust", "../common:asset_common", "../crypto_manager:asset_crypto_manager", "../db_key_operator:asset_db_key_operator", diff --git a/services/core_service/Cargo.toml b/services/core_service/Cargo.toml index e7727e0..0c98152 100755 --- a/services/core_service/Cargo.toml +++ b/services/core_service/Cargo.toml @@ -36,5 +36,5 @@ asset_utils = { path = "../../frameworks/utils" } asset_ipc = { path = "../../frameworks/ipc" } asset_log = { path = "../../frameworks/os_dependency/log" } asset_plugin = { path = "../plugin" } -asset_sdk = { path = "../../interfaces/inner_api/rs" } +asset_sdk = { path = "../../interfaces/inner_kits/rs" } lazy_static = "1.0.0" \ No newline at end of file diff --git a/services/core_service/src/common_event/listener.rs b/services/core_service/src/common_event/listener.rs index 2cc134b..8c79594 100644 --- a/services/core_service/src/common_event/listener.rs +++ b/services/core_service/src/common_event/listener.rs @@ -261,8 +261,8 @@ pub(crate) extern "C" fn on_user_unlocked(user_id: i32) { // Trigger upgrading ce db version and key alias match trigger_db_upgrade(user_id, true) { - Ok(()) => logi!("upgrade de db version and key alias on user-unlocked success."), - Err(e) => loge!("upgrade de db version and key alias on user-unlocked failed, err is: {}", e), + Ok(()) => logi!("upgrade ce db version and key alias on user-unlocked success."), + Err(e) => loge!("upgrade ce db version and key alias on user-unlocked failed, err is: {}", e), } if let Ok(load) = AssetPlugin::get_instance().load_plugin() { diff --git a/services/core_service/src/common_event/start_event.rs b/services/core_service/src/common_event/start_event.rs index f063494..f0be187 100644 --- a/services/core_service/src/common_event/start_event.rs +++ b/services/core_service/src/common_event/start_event.rs @@ -21,7 +21,7 @@ use asset_file_operator::de_operator::delete_user_de_dir; use asset_log::{loge, logi}; use system_ability_fwk::cxx_share::SystemAbilityOnDemandReason; -use crate::common_event::listener; +use crate::{common_event::listener, unload_handler::DELAYED_UNLOAD_TIME_IN_SEC, unload_sa}; const USER_ID: &str = "userId"; const SANDBOX_APP_INDEX: &str = "sandbox_app_index"; @@ -128,4 +128,5 @@ pub(crate) fn handle_common_event(reason: SystemAbilityOnDemandReason) { logi!("[INFO]On user -{}- pin created.", reason.extra_data.code); listener::on_user_unlocked(reason.extra_data.code); } + unload_sa(DELAYED_UNLOAD_TIME_IN_SEC as u64); } diff --git a/services/core_service/src/lib.rs b/services/core_service/src/lib.rs index 301d07c..c08f835 100644 --- a/services/core_service/src/lib.rs +++ b/services/core_service/src/lib.rs @@ -71,13 +71,11 @@ impl Ability for AssetAbility { let _ = upload_system_event(start_service(handler), &calling_info, start, func_name); common_event::handle_common_event(reason); - unload_sa(DELAYED_UNLOAD_TIME_IN_SEC as u64); } fn on_active(&self, reason: SystemAbilityOnDemandReason) { logi!("[INFO]Asset service on_active."); common_event::handle_common_event(reason); - unload_sa(DELAYED_UNLOAD_TIME_IN_SEC as u64); } fn on_idle(&self, _reason: SystemAbilityOnDemandReason) -> i32 { diff --git a/services/plugin/BUILD.gn b/services/plugin/BUILD.gn index 8adba5d..fc84942 100644 --- a/services/plugin/BUILD.gn +++ b/services/plugin/BUILD.gn @@ -20,7 +20,7 @@ ohos_rust_static_library("asset_plugin") { "../../frameworks/os_dependency/file:asset_file_operator", "../../frameworks/os_dependency/log:asset_log", "../../frameworks/utils:asset_utils", - "../../interfaces/inner_api/rs:asset_sdk_rust", + "../../interfaces/inner_kits/rs:asset_sdk_rust", "../common:asset_common", "../db_key_operator:asset_db_key_operator", "../db_operator:asset_db_operator", diff --git a/services/plugin/Cargo.toml b/services/plugin/Cargo.toml index 9a1a9ff..e088c106 100644 --- a/services/plugin/Cargo.toml +++ b/services/plugin/Cargo.toml @@ -22,7 +22,7 @@ edition = "2021" asset_common = { path = "../common" } asset_definition = { path = "../../frameworks/definition" } asset_log = { path = "../../frameworks/os_dependency/log" } -asset_sdk = { path = "../../interfaces/inner_api/rs" } +asset_sdk = { path = "../../interfaces/inner_kits/rs" } asset_db_key_operator = { path = "../db_key_operator" } asset_db_operator = { path = "../db_operator" } asset_file_operator = { path = "../../frameworks/os_dependency/file" } diff --git a/test/unittest/common/BUILD.gn b/test/unittest/common/BUILD.gn index 65783a7..1d469ce 100755 --- a/test/unittest/common/BUILD.gn +++ b/test/unittest/common/BUILD.gn @@ -18,13 +18,13 @@ ohos_static_library("asset_test_common") { sources = [ "src/asset_test_common.cpp" ] include_dirs = [ "inc", - "../../../interfaces/inner_api/c/inc", + "../../../interfaces/inner_kits/c/inc", "../../../interfaces/kits/c/inc", ] subsystem_name = "security" part_name = "asset" deps = [ - "../../../interfaces/inner_api/c:asset_sdk", + "../../../frameworks/c/system_api:asset_sdk", "../../../interfaces/kits/c:asset_ndk", ] } diff --git a/test/unittest/inner_api_rust/BUILD.gn b/test/unittest/inner_kits_rust/BUILD.gn similarity index 93% rename from test/unittest/inner_api_rust/BUILD.gn rename to test/unittest/inner_kits_rust/BUILD.gn index 89ea957..d152e19 100755 --- a/test/unittest/inner_api_rust/BUILD.gn +++ b/test/unittest/inner_kits_rust/BUILD.gn @@ -19,7 +19,7 @@ module_output_path = "asset/asset_UT_test" ohos_rust_unittest("asset_rust_test") { module_out_path = module_output_path sources = [ "src/main.rs" ] - deps = [ "../../../interfaces/inner_api/rs:asset_sdk_rust" ] + deps = [ "../../../interfaces/inner_kits/rs:asset_sdk_rust" ] subsystem_name = "security" part_name = "asset" } diff --git a/test/unittest/inner_api_rust/Cargo.toml b/test/unittest/inner_kits_rust/Cargo.toml similarity index 92% rename from test/unittest/inner_api_rust/Cargo.toml rename to test/unittest/inner_kits_rust/Cargo.toml index 3b9fd83..ec35394 100755 --- a/test/unittest/inner_api_rust/Cargo.toml +++ b/test/unittest/inner_kits_rust/Cargo.toml @@ -19,4 +19,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -asset_sdk = { path = "../../../interfaces/inner_api/rs" } \ No newline at end of file +asset_sdk = { path = "../../../interfaces/inner_kits/rs" } \ No newline at end of file diff --git a/test/unittest/inner_api_rust/src/add.rs b/test/unittest/inner_kits_rust/src/add.rs similarity index 100% rename from test/unittest/inner_api_rust/src/add.rs rename to test/unittest/inner_kits_rust/src/add.rs diff --git a/test/unittest/inner_api_rust/src/add_abnormal.rs b/test/unittest/inner_kits_rust/src/add_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/add_abnormal.rs rename to test/unittest/inner_kits_rust/src/add_abnormal.rs diff --git a/test/unittest/inner_api_rust/src/common.rs b/test/unittest/inner_kits_rust/src/common.rs similarity index 100% rename from test/unittest/inner_api_rust/src/common.rs rename to test/unittest/inner_kits_rust/src/common.rs diff --git a/test/unittest/inner_api_rust/src/main.rs b/test/unittest/inner_kits_rust/src/main.rs similarity index 100% rename from test/unittest/inner_api_rust/src/main.rs rename to test/unittest/inner_kits_rust/src/main.rs diff --git a/test/unittest/inner_api_rust/src/post_query.rs b/test/unittest/inner_kits_rust/src/post_query.rs similarity index 100% rename from test/unittest/inner_api_rust/src/post_query.rs rename to test/unittest/inner_kits_rust/src/post_query.rs diff --git a/test/unittest/inner_api_rust/src/post_query_abnormal.rs b/test/unittest/inner_kits_rust/src/post_query_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/post_query_abnormal.rs rename to test/unittest/inner_kits_rust/src/post_query_abnormal.rs diff --git a/test/unittest/inner_api_rust/src/pre_query.rs b/test/unittest/inner_kits_rust/src/pre_query.rs similarity index 100% rename from test/unittest/inner_api_rust/src/pre_query.rs rename to test/unittest/inner_kits_rust/src/pre_query.rs diff --git a/test/unittest/inner_api_rust/src/pre_query_abnormal.rs b/test/unittest/inner_kits_rust/src/pre_query_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/pre_query_abnormal.rs rename to test/unittest/inner_kits_rust/src/pre_query_abnormal.rs diff --git a/test/unittest/inner_api_rust/src/query.rs b/test/unittest/inner_kits_rust/src/query.rs similarity index 100% rename from test/unittest/inner_api_rust/src/query.rs rename to test/unittest/inner_kits_rust/src/query.rs diff --git a/test/unittest/inner_api_rust/src/query_abnormal.rs b/test/unittest/inner_kits_rust/src/query_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/query_abnormal.rs rename to test/unittest/inner_kits_rust/src/query_abnormal.rs diff --git a/test/unittest/inner_api_rust/src/remove.rs b/test/unittest/inner_kits_rust/src/remove.rs similarity index 100% rename from test/unittest/inner_api_rust/src/remove.rs rename to test/unittest/inner_kits_rust/src/remove.rs diff --git a/test/unittest/inner_api_rust/src/remove_abnormal.rs b/test/unittest/inner_kits_rust/src/remove_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/remove_abnormal.rs rename to test/unittest/inner_kits_rust/src/remove_abnormal.rs diff --git a/test/unittest/inner_api_rust/src/update.rs b/test/unittest/inner_kits_rust/src/update.rs similarity index 100% rename from test/unittest/inner_api_rust/src/update.rs rename to test/unittest/inner_kits_rust/src/update.rs diff --git a/test/unittest/inner_api_rust/src/update_abnormal.rs b/test/unittest/inner_kits_rust/src/update_abnormal.rs similarity index 100% rename from test/unittest/inner_api_rust/src/update_abnormal.rs rename to test/unittest/inner_kits_rust/src/update_abnormal.rs diff --git a/test/unittest/kits_ndk/BUILD.gn b/test/unittest/kits_ndk/BUILD.gn index 7abbdad..03aa6c1 100755 --- a/test/unittest/kits_ndk/BUILD.gn +++ b/test/unittest/kits_ndk/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("asset_ndk_test") { part_name = "asset" include_dirs = [ "inc", - "../../../interfaces/inner_api/c/inc", + "../../../interfaces/inner_kits/c/inc", "../../../interfaces/kits/c/inc", "../common/inc", ] @@ -34,7 +34,7 @@ ohos_unittest("asset_ndk_test") { "src/asset_update_test.cpp", ] deps = [ - "../../../interfaces/inner_api/c:asset_sdk", + "../../../frameworks/c/system_api:asset_sdk", "../../../interfaces/kits/c:asset_ndk", "../common:asset_test_common", ] diff --git a/test/unittest/module_test/BUILD.gn b/test/unittest/module_test/BUILD.gn index 6fd5854..fca997d 100755 --- a/test/unittest/module_test/BUILD.gn +++ b/test/unittest/module_test/BUILD.gn @@ -40,7 +40,7 @@ ohos_unittest("asset_dependency_test") { part_name = "asset" include_dirs = [ "inc", - "../../../interfaces/inner_api/c/inc", + "../../../interfaces/inner_kits/c/inc", "../../../interfaces/kits/c/inc", "../../../services/os_dependency/inc", "../../../services/crypto_manager/src", @@ -58,7 +58,7 @@ ohos_unittest("asset_dependency_test") { "src/system_event_wrapper_test.cpp", ] deps = [ - "../../../interfaces/inner_api/c:asset_sdk", + "../../../frameworks/c/system_api:asset_sdk", "../../../interfaces/kits/c:asset_ndk", "../../../services/crypto_manager:asset_huks_wrapper", "../../../services/os_dependency:asset_os_dependency",