From 8382b8fc667dbbd93b0e9f65040714efeb928f77 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Fri, 18 Oct 2024 17:28:17 +0800 Subject: [PATCH] change innerkits to inner_api Signed-off-by: wangyongzhong2 --- BUILD.gn | 2 +- bundle.json | 4 +- .../datatransmitmgr/BUILD.gn | 0 .../datatransmitmgr/include/dev_slinfo_adpt.h | 138 +++++++++--------- .../datatransmitmgr/include/dev_slinfo_list.h | 96 ++++++------ .../datatransmitmgr/include/dev_slinfo_log.h | 96 ++++++------ .../datatransmitmgr/include/dev_slinfo_mgr.h | 120 +++++++-------- .../datatransmitmgr_fuzzer/BUILD.gn | 4 +- .../devslinfoadpt_fuzzer/BUILD.gn | 4 +- .../gethighestseclevel_fuzzer/BUILD.gn | 4 +- .../gethighestseclevelasync_fuzzer/BUILD.gn | 4 +- test/unittest/datatransmitmgr/BUILD.gn | 5 +- 12 files changed, 238 insertions(+), 239 deletions(-) rename interfaces/{innerkits => inner_api}/datatransmitmgr/BUILD.gn (100%) rename interfaces/{innerkits => inner_api}/datatransmitmgr/include/dev_slinfo_adpt.h (97%) rename interfaces/{innerkits => inner_api}/datatransmitmgr/include/dev_slinfo_list.h (96%) rename interfaces/{innerkits => inner_api}/datatransmitmgr/include/dev_slinfo_log.h (97%) rename interfaces/{innerkits => inner_api}/datatransmitmgr/include/dev_slinfo_mgr.h (96%) diff --git a/BUILD.gn b/BUILD.gn index f26cc11..95cb23a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,6 +14,6 @@ import("//build/ohos.gni") group("dataclassification_build_module") { if (os_level == "standard") { - deps = [ "interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] } } diff --git a/bundle.json b/bundle.json index 6920d71..c0e585b 100644 --- a/bundle.json +++ b/bundle.json @@ -41,12 +41,12 @@ ], "inner_kits": [ { - "name": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr", + "name": "//base/security/dataclassification/interfaces/inner_api/datatransmitmgr:data_transit_mgr", "header": { "header_files": [ "dev_slinfo_mgr.h" ], - "header_base": "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include" + "header_base": "//base/security/dataclassification/interfaces/inner_api/datatransmitmgr/include" } } ], diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/inner_api/datatransmitmgr/BUILD.gn similarity index 100% rename from interfaces/innerkits/datatransmitmgr/BUILD.gn rename to interfaces/inner_api/datatransmitmgr/BUILD.gn diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_adpt.h similarity index 97% rename from interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h rename to interfaces/inner_api/datatransmitmgr/include/dev_slinfo_adpt.h index 2bcf8d2..2b5bf49 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h +++ b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_adpt.h @@ -1,70 +1,70 @@ -/* - * Copyright (C) 2022 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 DEV_SLINFO_ADPT_H -#define DEV_SLINFO_ADPT_H - -#include "device_security_info.h" -#include "dev_slinfo_mgr.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define DEFAULT_DEV_SEC_LEVEL 0 -#define DEV_SEC_LEVEL1 1 /* sl1 */ -#define DEV_SEC_LEVEL2 2 /* sl2 */ -#define DEV_SEC_LEVEL3 3 /* sl3 */ -#define DEV_SEC_LEVEL4 4 /* sl4 */ -#define DEV_SEC_LEVEL5 5 /* sl5 */ - -typedef int32_t (*RequestDeviceSecurityInfoFunction)(const DeviceIdentify *identify, - const RequestOption *option, - DeviceSecurityInfo **info); - -typedef int32_t (*RequestDeviceSecurityInfoAsyncFunction)(const DeviceIdentify *identify, - const RequestOption *option, - DeviceSecurityInfoCallback callback); - -typedef void (*FreeDeviceSecurityInfoFunction)(DeviceSecurityInfo *info); - -typedef int32_t (*GetDeviceSecurityLevelValueFunction)(const DeviceSecurityInfo *info, int32_t *level); - -typedef struct { - RequestDeviceSecurityInfoFunction requestDeviceSecurityInfo; - RequestDeviceSecurityInfoAsyncFunction requestDeviceSecurityInfoAsync; - FreeDeviceSecurityInfoFunction freeDeviceSecurityInfo; - GetDeviceSecurityLevelValueFunction getDeviceSecurityLevelValue; - int32_t version; -} DeviceSecEnv; - -int32_t StartDevslEnv(void); - -void FinishDevslEnv(void); - -int32_t GetDeviceSecLevelByUdid(const uint8_t *udid, uint32_t udidLen, int32_t *devLevel); - -int32_t CompareUdid(DEVSLQueryParams *queryParamsL, DEVSLQueryParams *queryParamsR); - -int32_t GetDeviceSecLevelByUdidAsync(const uint8_t *udid, uint32_t udidLen); - -uint32_t GetDataSecLevelByDevSecLevel(int32_t devLevel); - -int32_t UpdateCallbackListParams(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); - -#ifdef __cplusplus -} -#endif +/* + * Copyright (C) 2022 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 DEV_SLINFO_ADPT_H +#define DEV_SLINFO_ADPT_H + +#include "device_security_info.h" +#include "dev_slinfo_mgr.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define DEFAULT_DEV_SEC_LEVEL 0 +#define DEV_SEC_LEVEL1 1 /* sl1 */ +#define DEV_SEC_LEVEL2 2 /* sl2 */ +#define DEV_SEC_LEVEL3 3 /* sl3 */ +#define DEV_SEC_LEVEL4 4 /* sl4 */ +#define DEV_SEC_LEVEL5 5 /* sl5 */ + +typedef int32_t (*RequestDeviceSecurityInfoFunction)(const DeviceIdentify *identify, + const RequestOption *option, + DeviceSecurityInfo **info); + +typedef int32_t (*RequestDeviceSecurityInfoAsyncFunction)(const DeviceIdentify *identify, + const RequestOption *option, + DeviceSecurityInfoCallback callback); + +typedef void (*FreeDeviceSecurityInfoFunction)(DeviceSecurityInfo *info); + +typedef int32_t (*GetDeviceSecurityLevelValueFunction)(const DeviceSecurityInfo *info, int32_t *level); + +typedef struct { + RequestDeviceSecurityInfoFunction requestDeviceSecurityInfo; + RequestDeviceSecurityInfoAsyncFunction requestDeviceSecurityInfoAsync; + FreeDeviceSecurityInfoFunction freeDeviceSecurityInfo; + GetDeviceSecurityLevelValueFunction getDeviceSecurityLevelValue; + int32_t version; +} DeviceSecEnv; + +int32_t StartDevslEnv(void); + +void FinishDevslEnv(void); + +int32_t GetDeviceSecLevelByUdid(const uint8_t *udid, uint32_t udidLen, int32_t *devLevel); + +int32_t CompareUdid(DEVSLQueryParams *queryParamsL, DEVSLQueryParams *queryParamsR); + +int32_t GetDeviceSecLevelByUdidAsync(const uint8_t *udid, uint32_t udidLen); + +uint32_t GetDataSecLevelByDevSecLevel(int32_t devLevel); + +int32_t UpdateCallbackListParams(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); + +#ifdef __cplusplus +} +#endif #endif \ No newline at end of file diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_list.h b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_list.h similarity index 96% rename from interfaces/innerkits/datatransmitmgr/include/dev_slinfo_list.h rename to interfaces/inner_api/datatransmitmgr/include/dev_slinfo_list.h index c15b2d4..18cdaa4 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_list.h +++ b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_list.h @@ -1,49 +1,49 @@ -/* - * Copyright (C) 2022 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 DEV_SLINFO_LIST_H -#define DEV_SLINFO_LIST_H - -#include -#include "dev_slinfo_mgr.h" - -struct DATASLCallbackParams { - DEVSLQueryParams queryParams; - HigestSecInfoCallback *callback; -}; - -struct DATASLListParams { - struct DATASLCallbackParams *callbackParams; - struct DATASLListParams *prev; - struct DATASLListParams *next; -}; - -struct DATASLListParams* InitList(void); - -int32_t PushListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams); - -void RemoveListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams); - -void ClearList(struct DATASLListParams *list); - -int32_t GetListLength(struct DATASLListParams *list); - -int32_t InitPthreadMutex(void); - -void DestroyPthreadMutex(void); - -void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo); - +/* + * Copyright (C) 2022 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 DEV_SLINFO_LIST_H +#define DEV_SLINFO_LIST_H + +#include +#include "dev_slinfo_mgr.h" + +struct DATASLCallbackParams { + DEVSLQueryParams queryParams; + HigestSecInfoCallback *callback; +}; + +struct DATASLListParams { + struct DATASLCallbackParams *callbackParams; + struct DATASLListParams *prev; + struct DATASLListParams *next; +}; + +struct DATASLListParams* InitList(void); + +int32_t PushListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams); + +void RemoveListNode(struct DATASLListParams *list, struct DATASLCallbackParams *callbackParams); + +void ClearList(struct DATASLListParams *list); + +int32_t GetListLength(struct DATASLListParams *list); + +int32_t InitPthreadMutex(void); + +void DestroyPthreadMutex(void); + +void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo); + #endif \ No newline at end of file diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_log.h similarity index 97% rename from interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h rename to interfaces/inner_api/datatransmitmgr/include/dev_slinfo_log.h index be4a6d6..663c90b 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h +++ b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_log.h @@ -1,49 +1,49 @@ -/* - * Copyright (C) 2022-2024 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 DEV_SLINFO_LOG_H -#define DEV_SLINFO_LOG_H - -#ifdef HILOG_ENABLE - -#include "hilog/log.h" - -#ifdef LOG_TAG -#undef LOG_TAG -#endif -#define LOG_TAG "DataSl" - -#ifdef LOG_DOMAIN -#undef LOG_DOMAIN -#endif -#define LOG_DOMAIN 0xD002F04 - -#define DATA_SEC_LOG_DEBUG(fmt, ...) HILOG_DEBUG(LOG_CORE, fmt, ##__VA_ARGS__) -#define DATA_SEC_LOG_INFO(fmt, ...) HILOG_INFO(LOG_CORE, fmt, ##__VA_ARGS__) -#define DATA_SEC_LOG_WARN(fmt, ...) HILOG_WARN(LOG_CORE, fmt, ##__VA_ARGS__) -#define DATA_SEC_LOG_ERROR(fmt, ...) HILOG_ERROR(LOG_CORE, fmt, ##__VA_ARGS__) - -#else - -#include -#include - -#define DATA_SEC_LOG_DEBUG(fmt, ...) printf("[DataSl][D][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) -#define DATA_SEC_LOG_INFO(fmt, ...) printf("[DataSl][I][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) -#define DATA_SEC_LOG_WARN(fmt, ...) printf("[DataSl][W][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) -#define DATA_SEC_LOG_ERROR(fmt, ...) printf("[DataSl][E][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) - -#endif +/* + * Copyright (C) 2022-2024 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 DEV_SLINFO_LOG_H +#define DEV_SLINFO_LOG_H + +#ifdef HILOG_ENABLE + +#include "hilog/log.h" + +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "DataSl" + +#ifdef LOG_DOMAIN +#undef LOG_DOMAIN +#endif +#define LOG_DOMAIN 0xD002F04 + +#define DATA_SEC_LOG_DEBUG(fmt, ...) HILOG_DEBUG(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_INFO(fmt, ...) HILOG_INFO(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_WARN(fmt, ...) HILOG_WARN(LOG_CORE, fmt, ##__VA_ARGS__) +#define DATA_SEC_LOG_ERROR(fmt, ...) HILOG_ERROR(LOG_CORE, fmt, ##__VA_ARGS__) + +#else + +#include +#include + +#define DATA_SEC_LOG_DEBUG(fmt, ...) printf("[DataSl][D][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) +#define DATA_SEC_LOG_INFO(fmt, ...) printf("[DataSl][I][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) +#define DATA_SEC_LOG_WARN(fmt, ...) printf("[DataSl][W][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) +#define DATA_SEC_LOG_ERROR(fmt, ...) printf("[DataSl][E][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) + +#endif #endif \ No newline at end of file diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_mgr.h b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_mgr.h similarity index 96% rename from interfaces/innerkits/datatransmitmgr/include/dev_slinfo_mgr.h rename to interfaces/inner_api/datatransmitmgr/include/dev_slinfo_mgr.h index 10dc2f2..921322f 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_mgr.h +++ b/interfaces/inner_api/datatransmitmgr/include/dev_slinfo_mgr.h @@ -1,61 +1,61 @@ -/* - * Copyright (C) 2022 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 DEV_SLINFO_MGR_H -#define DEV_SLINFO_MGR_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#define MAX_UDID_LENGTH 64 - -#define DATA_SEC_LEVEL0 0 /* s0 */ -#define DATA_SEC_LEVEL1 1 /* s1 */ -#define DATA_SEC_LEVEL2 2 /* s2 */ -#define DATA_SEC_LEVEL3 3 /* s3 */ -#define DATA_SEC_LEVEL4 4 /* s4 */ - -typedef struct { - uint8_t udid[MAX_UDID_LENGTH]; - uint32_t udidLen; -} DEVSLQueryParams; - -enum { - DEVSL_SUCCESS = 0, - DEVSL_ERROR = 100, - DEVSL_ERR_REQUEST_DEVICE_EXCEED_LIMIT = 101, - DEVSL_ERR_DEVICE_SEC_SDK_INIT = 102, - DEVSL_ERR_OUT_OF_MEMORY = 103, - DEVSL_ERR_MUTEX_LOCK_INIT = 104, - DEVSL_ERR_BAD_PARAMETERS = 105, -}; - -int32_t DATASL_GetHighestSecLevel(DEVSLQueryParams *queryParams, uint32_t *levelInfo); - -int32_t DATASL_OnStart(void); - -void DATASL_OnStop(void); - -typedef void HigestSecInfoCallback(DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo); - -int32_t DATASL_GetHighestSecLevelAsync(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); - -#ifdef __cplusplus -} -#endif +/* + * Copyright (C) 2022 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 DEV_SLINFO_MGR_H +#define DEV_SLINFO_MGR_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define MAX_UDID_LENGTH 64 + +#define DATA_SEC_LEVEL0 0 /* s0 */ +#define DATA_SEC_LEVEL1 1 /* s1 */ +#define DATA_SEC_LEVEL2 2 /* s2 */ +#define DATA_SEC_LEVEL3 3 /* s3 */ +#define DATA_SEC_LEVEL4 4 /* s4 */ + +typedef struct { + uint8_t udid[MAX_UDID_LENGTH]; + uint32_t udidLen; +} DEVSLQueryParams; + +enum { + DEVSL_SUCCESS = 0, + DEVSL_ERROR = 100, + DEVSL_ERR_REQUEST_DEVICE_EXCEED_LIMIT = 101, + DEVSL_ERR_DEVICE_SEC_SDK_INIT = 102, + DEVSL_ERR_OUT_OF_MEMORY = 103, + DEVSL_ERR_MUTEX_LOCK_INIT = 104, + DEVSL_ERR_BAD_PARAMETERS = 105, +}; + +int32_t DATASL_GetHighestSecLevel(DEVSLQueryParams *queryParams, uint32_t *levelInfo); + +int32_t DATASL_OnStart(void); + +void DATASL_OnStop(void); + +typedef void HigestSecInfoCallback(DEVSLQueryParams *queryParams, int32_t result, uint32_t levelInfo); + +int32_t DATASL_GetHighestSecLevelAsync(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); + +#ifdef __cplusplus +} +#endif #endif \ No newline at end of file diff --git a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn index 6ecedb2..ac1797f 100644 --- a/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn +++ b/test/fuzztest/datatransmitmgr/datatransmitmgr_fuzzer/BUILD.gn @@ -27,12 +27,12 @@ ohos_fuzztest("DataTransmitMgrFuzzTest") { include_dirs = [ "./", - "../../../../interfaces/innerkits/datatransmitmgr/include", + "../../../../interfaces/inner_api/datatransmitmgr/include", ] sources = [ "datatransmitmgr_fuzzer.cpp" ] - deps = [ "../../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "../../../../interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/datatransmitmgr/devslinfoadpt_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/devslinfoadpt_fuzzer/BUILD.gn index 1f9379f..7372cb7 100644 --- a/test/fuzztest/datatransmitmgr/devslinfoadpt_fuzzer/BUILD.gn +++ b/test/fuzztest/datatransmitmgr/devslinfoadpt_fuzzer/BUILD.gn @@ -27,12 +27,12 @@ ohos_fuzztest("DevSlinfoAdptFuzzTest") { include_dirs = [ "./", - "../../../../interfaces/innerkits/datatransmitmgr/include", + "../../../../interfaces/inner_api/datatransmitmgr/include", ] sources = [ "devslinfoadpt_fuzzer.cpp" ] - deps = [ "../../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "../../../../interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] defines = [ "HILOG_ENABLE" ] diff --git a/test/fuzztest/datatransmitmgr/gethighestseclevel_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/gethighestseclevel_fuzzer/BUILD.gn index b987c22..d947d97 100644 --- a/test/fuzztest/datatransmitmgr/gethighestseclevel_fuzzer/BUILD.gn +++ b/test/fuzztest/datatransmitmgr/gethighestseclevel_fuzzer/BUILD.gn @@ -27,12 +27,12 @@ ohos_fuzztest("GetHighestSecLevelFuzzTest") { include_dirs = [ "./", - "../../../../interfaces/innerkits/datatransmitmgr/include", + "../../../../interfaces/inner_api/datatransmitmgr/include", ] sources = [ "gethighestseclevel_fuzzer.cpp" ] - deps = [ "../../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "../../../../interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] defines = [ "HILOG_ENABLE" ] diff --git a/test/fuzztest/datatransmitmgr/gethighestseclevelasync_fuzzer/BUILD.gn b/test/fuzztest/datatransmitmgr/gethighestseclevelasync_fuzzer/BUILD.gn index ac5e5f1..3ba39ad 100644 --- a/test/fuzztest/datatransmitmgr/gethighestseclevelasync_fuzzer/BUILD.gn +++ b/test/fuzztest/datatransmitmgr/gethighestseclevelasync_fuzzer/BUILD.gn @@ -27,12 +27,12 @@ ohos_fuzztest("GetHighestSecLevelAsyncFuzzTest") { include_dirs = [ "./", - "../../../../interfaces/innerkits/datatransmitmgr/include", + "../../../../interfaces/inner_api/datatransmitmgr/include", ] sources = [ "gethighestseclevelasync_fuzzer.cpp" ] - deps = [ "../../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "../../../../interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] defines = [ "HILOG_ENABLE" ] diff --git a/test/unittest/datatransmitmgr/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn index b017bb2..9631c8b 100644 --- a/test/unittest/datatransmitmgr/BUILD.gn +++ b/test/unittest/datatransmitmgr/BUILD.gn @@ -18,8 +18,7 @@ config("datatransmitmgr_test_config") { visibility = [ ":*" ] include_dirs = [ "//base/security/dataclassification/test/unittest/datatransmitmgr", - "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr/include", - "//base/startup/init/interfaces/innerkits/include/syspara", + "../../../interfaces/inner_api/datatransmitmgr/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", ] @@ -45,7 +44,7 @@ ohos_unittest("DevSLMgrTest") { } } - deps = [ "../../../interfaces/innerkits/datatransmitmgr:data_transit_mgr" ] + deps = [ "../../../interfaces/inner_api/datatransmitmgr:data_transit_mgr" ] defines = [ "HILOG_ENABLE" ] -- Gitee