From 71514d3f5a0213ccb2e06c7bb3291d406393d9aa Mon Sep 17 00:00:00 2001 From: l00520400 Date: Fri, 14 Jan 2022 16:04:11 +0800 Subject: [PATCH] modify path Signed-off-by: l00520400 Change-Id: If53368b276421e069b91a59b1dc4231ff9a26259 Signed-off-by: l00520400 --- BUILD.gn | 4 +-- README_zh.md | 2 +- bundle.json | 2 +- frameworks/accesstoken/BUILD.gn | 15 ++++---- frameworks/common/BUILD.gn | 8 ++--- interfaces/innerkits/accesstoken/BUILD.gn | 14 ++++---- .../{main/cpp => }/include/access_token.h | 0 .../accesstoken/include/accesstoken.h | 36 +++++++++++++++++++ .../{main/cpp => }/include/accesstoken_kit.h | 0 .../{main/cpp => }/include/hap_token_info.h | 0 .../cpp => }/include/native_token_info.h | 0 .../{main/cpp => }/include/permission_def.h | 0 .../cpp => }/include/permission_state_full.h | 0 .../{main/cpp => }/src/accesstoken_kit.cpp | 0 .../src/accesstoken_manager_client.cpp | 0 .../cpp => }/src/accesstoken_manager_client.h | 0 .../src/accesstoken_manager_proxy.cpp | 0 .../cpp => }/src/accesstoken_manager_proxy.h | 0 .../innerkits/accesstoken/test/BUILD.gn | 4 +-- .../{cpp => }/src/accesstoken_kit_test.cpp | 0 .../{cpp => }/src/accesstoken_kit_test.h | 0 .../innerkits/{atlib => nativetoken}/BUILD.gn | 12 +++---- .../include/nativetoken.h} | 8 ++--- .../include/nativetoken_kit.h} | 7 ++-- .../include/nativetoken_log.h} | 0 .../src/nativetoken.c} | 4 +-- .../{atlib => nativetoken}/test/BUILD.gn | 10 +++--- .../unittest/src/nativetoken_kit_test.cpp} | 6 ++-- .../test/unittest/src/nativetoken_kit_test.h} | 0 .../innerkits/token_setproc/test/BUILD.gn | 2 +- .../{cpp => }/src/tokensetproc_kit_test.cpp | 0 .../{cpp => }/src/tokensetproc_kit_test.h | 0 interfaces/innerkits/tokensync/BUILD.gn | 15 ++++---- .../{main/cpp => }/include/tokensync_kit.h | 0 .../{main/cpp => }/src/tokensync_kit.cpp | 0 .../cpp => }/src/tokensync_manager_client.cpp | 0 .../cpp => }/src/tokensync_manager_client.h | 0 .../cpp => }/src/tokensync_manager_proxy.cpp | 0 .../cpp => }/src/tokensync_manager_proxy.h | 0 interfaces/innerkits/tokensync/test/BUILD.gn | 7 ++-- .../{cpp => }/src/tokensync_kit_test.cpp | 0 .../{cpp => }/src/tokensync_kit_test.h | 0 interfaces/kits/accesstoken/BUILD.gn | 2 +- ohos.build | 2 +- services/accesstokenmanager/BUILD.gn | 2 +- 45 files changed, 100 insertions(+), 62 deletions(-) mode change 100644 => 100755 bundle.json rename interfaces/innerkits/accesstoken/{main/cpp => }/include/access_token.h (100%) create mode 100755 interfaces/innerkits/accesstoken/include/accesstoken.h rename interfaces/innerkits/accesstoken/{main/cpp => }/include/accesstoken_kit.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/include/hap_token_info.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/include/native_token_info.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/include/permission_def.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/include/permission_state_full.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/src/accesstoken_kit.cpp (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/src/accesstoken_manager_client.cpp (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/src/accesstoken_manager_client.h (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/src/accesstoken_manager_proxy.cpp (100%) rename interfaces/innerkits/accesstoken/{main/cpp => }/src/accesstoken_manager_proxy.h (100%) rename interfaces/innerkits/accesstoken/test/unittest/{cpp => }/src/accesstoken_kit_test.cpp (100%) rename interfaces/innerkits/accesstoken/test/unittest/{cpp => }/src/accesstoken_kit_test.h (100%) rename interfaces/innerkits/{atlib => nativetoken}/BUILD.gn (89%) rename interfaces/innerkits/{atlib/main/include/accesstoken_lib.h => nativetoken/include/nativetoken.h} (92%) rename interfaces/innerkits/{atlib/main/include/accesstokenlib_kit.h => nativetoken/include/nativetoken_kit.h} (82%) rename interfaces/innerkits/{atlib/main/include/accesstoken_log.h => nativetoken/include/nativetoken_log.h} (100%) rename interfaces/innerkits/{atlib/main/src/accesstoken_lib.c => nativetoken/src/nativetoken.c} (99%) rename interfaces/innerkits/{atlib => nativetoken}/test/BUILD.gn (79%) rename interfaces/innerkits/{atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp => nativetoken/test/unittest/src/nativetoken_kit_test.cpp} (99%) rename interfaces/innerkits/{atlib/test/unittest/cpp/src/accesstokenlib_kit_test.h => nativetoken/test/unittest/src/nativetoken_kit_test.h} (100%) rename interfaces/innerkits/token_setproc/test/unittest/{cpp => }/src/tokensetproc_kit_test.cpp (100%) rename interfaces/innerkits/token_setproc/test/unittest/{cpp => }/src/tokensetproc_kit_test.h (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/include/tokensync_kit.h (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/src/tokensync_kit.cpp (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/src/tokensync_manager_client.cpp (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/src/tokensync_manager_client.h (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/src/tokensync_manager_proxy.cpp (100%) rename interfaces/innerkits/tokensync/{main/cpp => }/src/tokensync_manager_proxy.h (100%) rename interfaces/innerkits/tokensync/test/unittest/{cpp => }/src/tokensync_kit_test.cpp (100%) rename interfaces/innerkits/tokensync/test/unittest/{cpp => }/src/tokensync_kit_test.h (100%) diff --git a/BUILD.gn b/BUILD.gn index f2393de68..97c62f984 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -17,7 +17,7 @@ group("accesstoken_build_module") { if (is_standard_system) { deps = [ "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "//base/security/access_token/interfaces/innerkits/atlib:libaccesstoken_lib", + "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//base/security/access_token/interfaces/kits/accesstoken:libabilityaccessctrl", "//base/security/access_token/services/accesstokenmanager:accesstoken_manager_service", @@ -42,7 +42,7 @@ group("accesstoken_build_module_test") { if (is_standard_system) { deps += [ "//base/security/access_token/interfaces/innerkits/accesstoken/test:unittest", - "//base/security/access_token/interfaces/innerkits/atlib/test:unittest", + "//base/security/access_token/interfaces/innerkits/nativetoken/test:unittest", "//base/security/access_token/interfaces/innerkits/token_setproc/test:unittest", "//base/security/access_token/interfaces/innerkits/tokensync/test:unittest", "//base/security/access_token/services/accesstokenmanager/test:unittest", diff --git a/README_zh.md b/README_zh.md index 3553aebf0..23be5b3af 100644 --- a/README_zh.md +++ b/README_zh.md @@ -28,7 +28,7 @@ ATM模块主要提供如下功能： ├── interfaces # 接口层 │ └── innerkits # 内部接口层 │ ├── accesstoken # Accesstoken内部接口代码存放目录 -│ ├── accesstoken_lib # Accesstoken_lib内部接口代码存放目录 +│ ├── nativetoken # nativetoken内部接口代码存放目录 │ └── tokensync # Accesstoken信息同步内部接口代码存放目录 └── services # 服务层 ├── accesstokenmanager # Accesstoken管理服务代码存放目录 diff --git a/bundle.json b/bundle.json old mode 100644 new mode 100755 index 98aaaa038..a33458f1f --- a/bundle.json +++ b/bundle.json @@ -43,7 +43,7 @@ "header_files": [ "accesstoken_kit.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include" + "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include" } } ], diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn index b11ba2978..1489a5df0 100644 --- a/frameworks/accesstoken/BUILD.gn +++ b/frameworks/accesstoken/BUILD.gn @@ -20,7 +20,7 @@ config("accesstoken_communication_adapter_cxx_public_config") { visibility = [ ":*" ] include_dirs = [ "include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] } @@ -28,22 +28,21 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") { subsystem_name = "security" part_name = "access_token" - public_configs = - [ ":accesstoken_communication_adapter_cxx_public_config" ] + public_configs = [ ":accesstoken_communication_adapter_cxx_public_config" ] include_dirs = [ "include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//utils/native/base/include", ] sources = [ - "src/permission_def_parcel.cpp", - "src/permission_state_full_parcel.cpp", + "src/hap_info_parcel.cpp", "src/hap_policy_parcel.cpp", "src/hap_token_info_parcel.cpp", - "src/hap_info_parcel.cpp", - "src/native_token_info_parcel.cpp" + "src/native_token_info_parcel.cpp", + "src/permission_def_parcel.cpp", + "src/permission_state_full_parcel.cpp", ] deps = [ "//utils/native/base:utils" ] diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn index b63c67b3c..aad20da42 100644 --- a/frameworks/common/BUILD.gn +++ b/frameworks/common/BUILD.gn @@ -18,7 +18,7 @@ import("//build/ohos.gni") ################################################################ config("accesstoken_common_cxx_public_config") { visibility = [ ":*" ] - include_dirs = [ "main/cpp/include" ] + include_dirs = [ "include" ] } ohos_shared_library("accesstoken_common_cxx") { @@ -31,17 +31,17 @@ ohos_shared_library("accesstoken_common_cxx") { "include", "//utils/system/safwk/native/include", "//third_party/mbedtls/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] sources = [ "src/data_validator.cpp", - "src/random_mbedtls.cpp" + "src/random_mbedtls.cpp", ] deps = [ - "//utils/native/base:utils", "//third_party/mbedtls:mbedtls_shared", + "//utils/native/base:utils", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn index 1db916653..2c353eec6 100644 --- a/interfaces/innerkits/accesstoken/BUILD.gn +++ b/interfaces/innerkits/accesstoken/BUILD.gn @@ -18,7 +18,7 @@ import("//build/ohos.gni") ################################################################ config("accesstoken") { visibility = [ ":*" ] - include_dirs = [ "main/cpp/include" ] + include_dirs = [ "include" ] } ohos_shared_library("libaccesstoken_sdk") { @@ -31,17 +31,17 @@ ohos_shared_library("libaccesstoken_sdk") { include_dirs = [ "//utils/native/base/include", - "main/cpp/include", - "main/cpp/src", + "include", + "src", "//base/security/access_token/frameworks/accesstoken/include", "//base/security/access_token/frameworks/common/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] sources = [ - "main/cpp/src/accesstoken_kit.cpp", - "main/cpp/src/accesstoken_manager_client.cpp", - "main/cpp/src/accesstoken_manager_proxy.cpp", + "src/accesstoken_kit.cpp", + "src/accesstoken_manager_client.cpp", + "src/accesstoken_manager_proxy.cpp", ] deps = [ diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/access_token.h rename to interfaces/innerkits/accesstoken/include/access_token.h diff --git a/interfaces/innerkits/accesstoken/include/accesstoken.h b/interfaces/innerkits/accesstoken/include/accesstoken.h new file mode 100755 index 000000000..f0084d347 --- /dev/null +++ b/interfaces/innerkits/accesstoken/include/accesstoken.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2021 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. + */ + +#ifndef INTERFACES_INNER_KITS_ACCESSTOKEN_H +#define INTERFACES_INNER_KITS_ACCESSTOKEN_H + +namespace OHOS { +namespace Security { +namespace AccessToken { +typedef unsigned int AccessTokenID; +enum AccessTokenKitRet { + RET_FAILED = -1, + RET_SUCCESS = 0, +}; + +typedef enum TypePermissionState { + PERMISSION_DENIED = -1, + PERMISSION_GRANTED = 0, +} PermissionState; +} // namespace AccessToken +} // namespace Security +} // namespace OHOS + +#endif diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/accesstoken_kit.h rename to interfaces/innerkits/accesstoken/include/accesstoken_kit.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/hap_token_info.h b/interfaces/innerkits/accesstoken/include/hap_token_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/hap_token_info.h rename to interfaces/innerkits/accesstoken/include/hap_token_info.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/native_token_info.h b/interfaces/innerkits/accesstoken/include/native_token_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/native_token_info.h rename to interfaces/innerkits/accesstoken/include/native_token_info.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/permission_def.h b/interfaces/innerkits/accesstoken/include/permission_def.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/permission_def.h rename to interfaces/innerkits/accesstoken/include/permission_def.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/include/permission_state_full.h b/interfaces/innerkits/accesstoken/include/permission_state_full.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/include/permission_state_full.h rename to interfaces/innerkits/accesstoken/include/permission_state_full.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_kit.cpp rename to interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.cpp rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_client.h rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.cpp rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp diff --git a/interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h similarity index 100% rename from interfaces/innerkits/accesstoken/main/cpp/src/accesstoken_manager_proxy.h rename to interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/interfaces/innerkits/accesstoken/test/BUILD.gn index fed32567e..1a7965889 100755 --- a/interfaces/innerkits/accesstoken/test/BUILD.gn +++ b/interfaces/innerkits/accesstoken/test/BUILD.gn @@ -21,10 +21,10 @@ ohos_unittest("libaccesstoken_sdk_test") { include_dirs = [ "//utils/native/base/include", "//third_party/googletest/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include" + "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] - sources = [ "unittest/cpp/src/accesstoken_kit_test.cpp" ] + sources = [ "unittest/src/accesstoken_kit_test.cpp" ] cflags_cc = [ "-DHILOG_ENABLE" ] diff --git a/interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.cpp rename to interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.h b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/cpp/src/accesstoken_kit_test.h rename to interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h diff --git a/interfaces/innerkits/atlib/BUILD.gn b/interfaces/innerkits/nativetoken/BUILD.gn similarity index 89% rename from interfaces/innerkits/atlib/BUILD.gn rename to interfaces/innerkits/nativetoken/BUILD.gn index b24aa1ff7..cfac0a924 100644 --- a/interfaces/innerkits/atlib/BUILD.gn +++ b/interfaces/innerkits/nativetoken/BUILD.gn @@ -18,13 +18,13 @@ import("//build/ohos.gni") ################################################################ config("accesstokenlib") { visibility = [ ":*" ] - include_dirs = [ "main/include" ] + include_dirs = [ "include" ] } -ohos_shared_library("libaccesstoken_lib") { +ohos_static_library("libnativetoken") { subsystem_name = "security" part_name = "access_token" - output_name = "libaccesstoken_lib" + output_name = "libnativetoken" public_configs = [ ":accesstokenlib" ] @@ -34,14 +34,14 @@ ohos_shared_library("libaccesstoken_lib") { include_dirs = [ "//utils/native/base/include", "//base/security/access_token/frameworks/common/include", - "main/include", - "main/src", + "include", + "src", "//third_party/cJSON", "//third_party/bounds_checking_function/include", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", ] - sources = [ "main/src/accesstoken_lib.c" ] + sources = [ "src/nativetoken.c" ] deps = [ "//base/security/access_token/frameworks/common:accesstoken_common_cxx", diff --git a/interfaces/innerkits/atlib/main/include/accesstoken_lib.h b/interfaces/innerkits/nativetoken/include/nativetoken.h similarity index 92% rename from interfaces/innerkits/atlib/main/include/accesstoken_lib.h rename to interfaces/innerkits/nativetoken/include/nativetoken.h index e28f4b5e6..e40462310 100644 --- a/interfaces/innerkits/atlib/main/include/accesstoken_lib.h +++ b/interfaces/innerkits/nativetoken/include/nativetoken.h @@ -23,10 +23,10 @@ #include #include "cJSON.h" #include "securec.h" -#include "accesstoken_log.h" +#include "nativetoken_log.h" -#ifndef ACCESSTOKEN_LIB_H -#define ACCESSTOKEN_LIB_H +#ifndef NATIVE_TOKEN_H +#define NATIVE_TOKEN_H #ifdef __cplusplus extern "C" { @@ -92,4 +92,4 @@ extern char *GetFileBuff(const char *cfg); } #endif -#endif // ACCESSTOKEN_LIB_H +#endif // NATIVE_TOKEN_H diff --git a/interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h b/interfaces/innerkits/nativetoken/include/nativetoken_kit.h similarity index 82% rename from interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h rename to interfaces/innerkits/nativetoken/include/nativetoken_kit.h index d0511410e..f03eff95b 100644 --- a/interfaces/innerkits/atlib/main/include/accesstokenlib_kit.h +++ b/interfaces/innerkits/nativetoken/include/nativetoken_kit.h @@ -13,9 +13,10 @@ * limitations under the License. */ -#ifndef INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H -#define INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H +#ifndef INTERFACES_INNER_KITS_NATIVE_TOKEN_H +#define INTERFACES_INNER_KITS_NATIVE_TOKEN_H +#include #include #include #include @@ -32,4 +33,4 @@ extern uint64_t GetAccessTokenId(const char *processname, const char **dcap, int } #endif -#endif // INTERFACES_INNER_KITS_ACCESSTOKEN_LIB_H +#endif // INTERFACES_INNER_KITS_NATIVE_TOKEN_H diff --git a/interfaces/innerkits/atlib/main/include/accesstoken_log.h b/interfaces/innerkits/nativetoken/include/nativetoken_log.h similarity index 100% rename from interfaces/innerkits/atlib/main/include/accesstoken_log.h rename to interfaces/innerkits/nativetoken/include/nativetoken_log.h diff --git a/interfaces/innerkits/atlib/main/src/accesstoken_lib.c b/interfaces/innerkits/nativetoken/src/nativetoken.c similarity index 99% rename from interfaces/innerkits/atlib/main/src/accesstoken_lib.c rename to interfaces/innerkits/nativetoken/src/nativetoken.c index e227657be..74ab8c62b 100644 --- a/interfaces/innerkits/atlib/main/src/accesstoken_lib.c +++ b/interfaces/innerkits/nativetoken/src/nativetoken.c @@ -12,8 +12,8 @@ * See the License for the specific language governing ACCESSTOKENs and * limitations under the License. */ -#include "accesstoken_lib.h" -#include "accesstokenlib_kit.h" +#include "nativetoken.h" +#include "nativetoken_kit.h" #include "parameter.h" #include "random.h" diff --git a/interfaces/innerkits/atlib/test/BUILD.gn b/interfaces/innerkits/nativetoken/test/BUILD.gn similarity index 79% rename from interfaces/innerkits/atlib/test/BUILD.gn rename to interfaces/innerkits/nativetoken/test/BUILD.gn index 0ec2f8404..25f2784d0 100644 --- a/interfaces/innerkits/atlib/test/BUILD.gn +++ b/interfaces/innerkits/nativetoken/test/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") -ohos_unittest("libaccesstoken_lib_test") { +ohos_unittest("libnativetoken_test") { subsystem_name = "security" part_name = "access_token" module_out_path = part_name + "/" + part_name @@ -22,15 +22,15 @@ ohos_unittest("libaccesstoken_lib_test") { "//utils/native/base/include", "//third_party/cJSON", "//third_party/bounds_checking_function/include", - "//base/security/access_token/interfaces/innerkits/atlib/main/include", + "//base/security/access_token/interfaces/innerkits/nativetoken/include", ] - sources = [ "unittest/cpp/src/accesstokenlib_kit_test.cpp" ] + sources = [ "unittest/src/nativetoken_kit_test.cpp" ] cflags_cc = [ "-fexceptions" ] cflags_cc += [ "-pthread" ] deps = [ - "//base/security/access_token/interfaces/innerkits/atlib:libaccesstoken_lib", + "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//third_party/bounds_checking_function:libsec_static", "//third_party/cJSON:cjson_static", "//third_party/googletest:gmock", @@ -41,5 +41,5 @@ ohos_unittest("libaccesstoken_lib_test") { group("unittest") { testonly = true - deps = [ ":libaccesstoken_lib_test" ] + deps = [ ":libnativetoken_test" ] } diff --git a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp similarity index 99% rename from interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp rename to interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp index be80fe735..ff107e66a 100644 --- a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.cpp +++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "accesstokenlib_kit_test.h" +#include "nativetoken_kit_test.h" #include -#include "accesstoken_lib.h" -#include "accesstokenlib_kit.h" +#include "nativetoken.h" +#include "nativetoken_kit.h" using namespace testing::ext; using namespace OHOS::Security; diff --git a/interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.h b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h similarity index 100% rename from interfaces/innerkits/atlib/test/unittest/cpp/src/accesstokenlib_kit_test.h rename to interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h diff --git a/interfaces/innerkits/token_setproc/test/BUILD.gn b/interfaces/innerkits/token_setproc/test/BUILD.gn index ce6cf8dd1..9cac0ef65 100644 --- a/interfaces/innerkits/token_setproc/test/BUILD.gn +++ b/interfaces/innerkits/token_setproc/test/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("libtoken_setproc_test") { "//base/security/access_token/interfaces/innerkits/token_setproc/include", ] - sources = [ "unittest/cpp/src/tokensetproc_kit_test.cpp" ] + sources = [ "unittest/src/tokensetproc_kit_test.cpp" ] cflags_cc = [ "-fexceptions" ] deps = [ diff --git a/interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.cpp b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp similarity index 100% rename from interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.cpp rename to interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp diff --git a/interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.h b/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h similarity index 100% rename from interfaces/innerkits/token_setproc/test/unittest/cpp/src/tokensetproc_kit_test.h rename to interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h diff --git a/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn index 0fe7a7907..1d8ba9af6 100644 --- a/interfaces/innerkits/tokensync/BUILD.gn +++ b/interfaces/innerkits/tokensync/BUILD.gn @@ -18,7 +18,7 @@ import("//build/ohos.gni") ################################################################ config("tokensync") { visibility = [ ":*" ] - include_dirs = [ "main/cpp/include" ] + include_dirs = [ "include" ] } ohos_shared_library("libtokensync_sdk") { @@ -31,11 +31,12 @@ ohos_shared_library("libtokensync_sdk") { include_dirs = [ "//utils/native/base/include", - "main/cpp/include", - "main/cpp/src", + "include", + "src", "//base/security/access_token/frameworks/tokensync/include", "//base/security/access_token/frameworks/common/include", - "//base/security/access_token/interfaces/innerkits/tokensync/main/cpp/include" + "//base/security/access_token/interfaces/innerkits/tokensync/include", + #"//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission", ] @@ -43,9 +44,9 @@ ohos_shared_library("libtokensync_sdk") { #"main/cpp/src/permission/permission_kit.cpp", #"main/cpp/src/permission/permission_manager_client.cpp", #"main/cpp/src/permission/permission_manager_proxy.cpp", - "main/cpp/src/tokensync_kit.cpp", - "main/cpp/src/tokensync_manager_client.cpp", - "main/cpp/src/tokensync_manager_proxy.cpp", + "src/tokensync_kit.cpp", + "src/tokensync_manager_client.cpp", + "src/tokensync_manager_proxy.cpp", ] deps = [ diff --git a/interfaces/innerkits/tokensync/main/cpp/include/tokensync_kit.h b/interfaces/innerkits/tokensync/include/tokensync_kit.h similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/include/tokensync_kit.h rename to interfaces/innerkits/tokensync/include/tokensync_kit.h diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_kit.cpp b/interfaces/innerkits/tokensync/src/tokensync_kit.cpp similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_kit.cpp rename to interfaces/innerkits/tokensync/src/tokensync_kit.cpp diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.cpp b/interfaces/innerkits/tokensync/src/tokensync_manager_client.cpp similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.cpp rename to interfaces/innerkits/tokensync/src/tokensync_manager_client.cpp diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.h b/interfaces/innerkits/tokensync/src/tokensync_manager_client.h similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_client.h rename to interfaces/innerkits/tokensync/src/tokensync_manager_client.h diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.cpp b/interfaces/innerkits/tokensync/src/tokensync_manager_proxy.cpp similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.cpp rename to interfaces/innerkits/tokensync/src/tokensync_manager_proxy.cpp diff --git a/interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.h b/interfaces/innerkits/tokensync/src/tokensync_manager_proxy.h similarity index 100% rename from interfaces/innerkits/tokensync/main/cpp/src/tokensync_manager_proxy.h rename to interfaces/innerkits/tokensync/src/tokensync_manager_proxy.h diff --git a/interfaces/innerkits/tokensync/test/BUILD.gn b/interfaces/innerkits/tokensync/test/BUILD.gn index afbd3655f..867549338 100644 --- a/interfaces/innerkits/tokensync/test/BUILD.gn +++ b/interfaces/innerkits/tokensync/test/BUILD.gn @@ -21,16 +21,17 @@ ohos_unittest("libtokensync_sdk_test") { include_dirs = [ "//utils/native/base/include", "//third_party/googletest/include", + #"//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include/permission/", - "//base/security/access_token/interfaces/innerkits/tokensync/main/cpp/include" + "//base/security/access_token/interfaces/innerkits/tokensync/include", ] - sources = [ "unittest/cpp/src/tokensync_kit_test.cpp" ] + sources = [ "unittest/src/tokensync_kit_test.cpp" ] cflags_cc = [ "-DHILOG_ENABLE" ] deps = [ -#"//base/security/permission/frameworks/permission_standard/permissioninfrastructure:permission_standard_infrastructure_cxx", + #"//base/security/permission/frameworks/permission_standard/permissioninfrastructure:permission_standard_infrastructure_cxx", "//base/security/access_token/interfaces/innerkits/tokensync:libtokensync_sdk", "//utils/native/base:utils", ] diff --git a/interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.cpp b/interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.cpp similarity index 100% rename from interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.cpp rename to interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.cpp diff --git a/interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.h b/interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.h similarity index 100% rename from interfaces/innerkits/tokensync/test/unittest/cpp/src/tokensync_kit_test.h rename to interfaces/innerkits/tokensync/test/unittest/src/tokensync_kit_test.h diff --git a/interfaces/kits/accesstoken/BUILD.gn b/interfaces/kits/accesstoken/BUILD.gn index d385180a6..ac5b3afef 100644 --- a/interfaces/kits/accesstoken/BUILD.gn +++ b/interfaces/kits/accesstoken/BUILD.gn @@ -34,7 +34,7 @@ ohos_shared_library("libabilityaccessctrl") { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/interfaces/kits/accesstoken/napi/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", ] sources = [ "//base/security/access_token/interfaces/kits/accesstoken/napi/src/napi_atmanager.cpp" ] diff --git a/ohos.build b/ohos.build index f87ae64db..096603d4d 100644 --- a/ohos.build +++ b/ohos.build @@ -13,7 +13,7 @@ "header_files": [ "accesstoken_kit.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include" + "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include" } } ], diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index a46905ab6..fc866172a 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -32,7 +32,7 @@ ohos_shared_library("accesstoken_manager_service") { "//utils/system/safwk/native/include", "//base/security/access_token/frameworks/common/include", "//base/security/access_token/frameworks/accesstoken/include", - "//base/security/access_token/interfaces/innerkits/accesstoken/main/cpp/include", + "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//third_party/json/include", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include/", ] -- Gitee