From c837d9bd49a40166f29ce741a43d1ab3eafe53d4 Mon Sep 17 00:00:00 2001 From: jiyong Date: Thu, 3 Jun 2021 20:32:12 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong Change-Id: Iba3b7418f991b25e2352d5620d0e3b45f71555a5 --- .../{bundle_mgr_posix => appexecfwk_posix}/BUILD.gn | 0 .../{bundle_mgr_posix => appexecfwk_posix}/Test.json | 0 .../src/BundleMgrTest.cpp | 0 build_lite/BUILD.gn | 10 +++++----- security_lite/BUILD.gn | 2 +- security_lite/{datahuks_hal => huks_hal}/BUILD.gn | 0 security_lite/{datahuks_hal => huks_hal}/Test.tmpl | 0 .../src/security_data_huks.h | 0 .../src/security_data_huks_dec_test.c | 0 .../src/security_data_huks_enc_test.c | 0 .../src/security_data_huks_export_hash_random_test.c | 0 .../src/security_data_huks_gen_del_test.c | 0 .../src/security_data_huks_sign_verify_test.c | 0 security_lite/{datahuks_posix => huks_posix}/BUILD.gn | 0 security_lite/{datahuks_posix => huks_posix}/Test.json | 0 .../src/SecurityDataHuks.h | 0 .../src/SecurityDataHuksDecTest.cpp | 0 .../src/SecurityDataHuksEncTest.cpp | 0 .../src/SecurityDataHuksGenDelTest.cpp | 0 .../src/SecurityDataHuksHashRandomHmacTest.cpp | 0 update_lite/{updater_hal => dupdate_hal}/BUILD.gn | 0 update_lite/{updater_hal => dupdate_hal}/Test.tmpl | 0 .../{updater_hal => dupdate_hal}/src/ota_func_test.c | 0 update_lite/{updater_posix => dupdate_posix}/BUILD.gn | 0 update_lite/{updater_posix => dupdate_posix}/Test.json | 0 .../src/UpdateTest.cpp | 0 26 files changed, 6 insertions(+), 6 deletions(-) rename appexecfwk_lite/{bundle_mgr_posix => appexecfwk_posix}/BUILD.gn (100%) rename appexecfwk_lite/{bundle_mgr_posix => appexecfwk_posix}/Test.json (100%) rename appexecfwk_lite/{bundle_mgr_posix => appexecfwk_posix}/src/BundleMgrTest.cpp (100%) rename security_lite/{datahuks_hal => huks_hal}/BUILD.gn (100%) rename security_lite/{datahuks_hal => huks_hal}/Test.tmpl (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks.h (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks_dec_test.c (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks_enc_test.c (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks_export_hash_random_test.c (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks_gen_del_test.c (100%) rename security_lite/{datahuks_hal => huks_hal}/src/security_data_huks_sign_verify_test.c (100%) rename security_lite/{datahuks_posix => huks_posix}/BUILD.gn (100%) rename security_lite/{datahuks_posix => huks_posix}/Test.json (100%) rename security_lite/{datahuks_posix => huks_posix}/src/SecurityDataHuks.h (100%) rename security_lite/{datahuks_posix => huks_posix}/src/SecurityDataHuksDecTest.cpp (100%) rename security_lite/{datahuks_posix => huks_posix}/src/SecurityDataHuksEncTest.cpp (100%) rename security_lite/{datahuks_posix => huks_posix}/src/SecurityDataHuksGenDelTest.cpp (100%) rename security_lite/{datahuks_posix => huks_posix}/src/SecurityDataHuksHashRandomHmacTest.cpp (100%) rename update_lite/{updater_hal => dupdate_hal}/BUILD.gn (100%) rename update_lite/{updater_hal => dupdate_hal}/Test.tmpl (100%) rename update_lite/{updater_hal => dupdate_hal}/src/ota_func_test.c (100%) rename update_lite/{updater_posix => dupdate_posix}/BUILD.gn (100%) rename update_lite/{updater_posix => dupdate_posix}/Test.json (100%) rename update_lite/{updater_posix => dupdate_posix}/src/UpdateTest.cpp (100%) diff --git a/appexecfwk_lite/bundle_mgr_posix/BUILD.gn b/appexecfwk_lite/appexecfwk_posix/BUILD.gn similarity index 100% rename from appexecfwk_lite/bundle_mgr_posix/BUILD.gn rename to appexecfwk_lite/appexecfwk_posix/BUILD.gn diff --git a/appexecfwk_lite/bundle_mgr_posix/Test.json b/appexecfwk_lite/appexecfwk_posix/Test.json similarity index 100% rename from appexecfwk_lite/bundle_mgr_posix/Test.json rename to appexecfwk_lite/appexecfwk_posix/Test.json diff --git a/appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp b/appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp similarity index 100% rename from appexecfwk_lite/bundle_mgr_posix/src/BundleMgrTest.cpp rename to appexecfwk_lite/appexecfwk_posix/src/BundleMgrTest.cpp diff --git a/build_lite/BUILD.gn b/build_lite/BUILD.gn index 538e3b7da..999f30c2e 100644 --- a/build_lite/BUILD.gn +++ b/build_lite/BUILD.gn @@ -39,11 +39,11 @@ lite_component("acts_component") { "//test/xts/acts/iot_hardware_lite/iot_controller_hal:ActsWifiIotTest", "//test/xts/acts/kernel_lite/kernelcmsis_hal:ActsCMSISTest", "//test/xts/acts/utils_lite/kv_store_hal:ActsKvStoreTest", - "//test/xts/acts/security_lite/datahuks_hal:ActsSecurityDataTest", + "//test/xts/acts/security_lite/huks_hal:ActsSecurityDataTest", "//test/xts/acts/hiviewdfx_lite/hilog_hal:ActsDfxFuncTest", "//test/xts/acts/distributed_schedule_lite/system_ability_manager_hal:ActsSamgrTest", - "//test/xts/acts/update_lite/updater_hal:ActsUpdaterFuncTest", + "//test/xts/acts/update_lite/dupdate_hal:ActsUpdaterFuncTest", "//test/xts/acts/startup_lite/bootstrap_hal:ActsBootstrapTest", ] } else if (ohos_kernel_type == "liteos_a") { @@ -66,7 +66,7 @@ lite_component("acts_component") { "//test/xts/acts/graphic_lite/graphic_utils:uikit_test1", "//test/xts/acts/graphic_lite/surface:uikit_test2", "//test/xts/acts/graphic_lite/ui:uikit_test3", - "//test/xts/acts/appexecfwk_lite/bundle_mgr_posix:ActsBundleMgrTest", + "//test/xts/acts/appexecfwk_lite/appexecfwk_posix:ActsBundleMgrTest", "//test/xts/acts/aafwk_lite/ability_posix:ActsAbilityMgrTest", "//test/xts/acts/communication_lite/softbus_posix:ActsSoftBusTest", "//test/xts/acts/communication_lite/lwip_posix:ActsLwipTest", @@ -74,13 +74,13 @@ lite_component("acts_component") { "//test/xts/acts/ai_lite/ai_engine_posix/base:ActsAiEngineTest", "//test/xts/acts/global_lite:ActsGlobalTest", "//test/xts/acts/sensors_lite:sensorstest", - "//test/xts/acts/update_lite/updater_posix:ActsUpdateTest", + "//test/xts/acts/update_lite/dupdate_posix:ActsUpdateTest", ] } else if (ohos_kernel_type == "linux") { all_features += [ "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest", "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest", - "//test/xts/acts/security_lite/datahuks_posix:ActsSecurityDataTest", + "//test/xts/acts/security_lite/huks_posix:ActsSecurityDataTest", "//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest", #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest", #"//test/xts/acts/multimedia_lite/media_lite_posix/recorder_native:ActsMediaRecorderTest", diff --git a/security_lite/BUILD.gn b/security_lite/BUILD.gn index 25f7f15be..6122699c6 100755 --- a/security_lite/BUILD.gn +++ b/security_lite/BUILD.gn @@ -13,7 +13,7 @@ group("securitytest") { deps = [ - "//test/xts/acts/security_lite/datahuks_posix:ActsSecurityDataTest", + "//test/xts/acts/security_lite/huks_posix:ActsSecurityDataTest", "//test/xts/acts/security_lite/permission_posix/capability:ActsCapabilityTest", "//test/xts/acts/security_lite/permission_posix/dac:ActsDacTest", ] diff --git a/security_lite/datahuks_hal/BUILD.gn b/security_lite/huks_hal/BUILD.gn similarity index 100% rename from security_lite/datahuks_hal/BUILD.gn rename to security_lite/huks_hal/BUILD.gn diff --git a/security_lite/datahuks_hal/Test.tmpl b/security_lite/huks_hal/Test.tmpl similarity index 100% rename from security_lite/datahuks_hal/Test.tmpl rename to security_lite/huks_hal/Test.tmpl diff --git a/security_lite/datahuks_hal/src/security_data_huks.h b/security_lite/huks_hal/src/security_data_huks.h similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks.h rename to security_lite/huks_hal/src/security_data_huks.h diff --git a/security_lite/datahuks_hal/src/security_data_huks_dec_test.c b/security_lite/huks_hal/src/security_data_huks_dec_test.c similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks_dec_test.c rename to security_lite/huks_hal/src/security_data_huks_dec_test.c diff --git a/security_lite/datahuks_hal/src/security_data_huks_enc_test.c b/security_lite/huks_hal/src/security_data_huks_enc_test.c similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks_enc_test.c rename to security_lite/huks_hal/src/security_data_huks_enc_test.c diff --git a/security_lite/datahuks_hal/src/security_data_huks_export_hash_random_test.c b/security_lite/huks_hal/src/security_data_huks_export_hash_random_test.c similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks_export_hash_random_test.c rename to security_lite/huks_hal/src/security_data_huks_export_hash_random_test.c diff --git a/security_lite/datahuks_hal/src/security_data_huks_gen_del_test.c b/security_lite/huks_hal/src/security_data_huks_gen_del_test.c similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks_gen_del_test.c rename to security_lite/huks_hal/src/security_data_huks_gen_del_test.c diff --git a/security_lite/datahuks_hal/src/security_data_huks_sign_verify_test.c b/security_lite/huks_hal/src/security_data_huks_sign_verify_test.c similarity index 100% rename from security_lite/datahuks_hal/src/security_data_huks_sign_verify_test.c rename to security_lite/huks_hal/src/security_data_huks_sign_verify_test.c diff --git a/security_lite/datahuks_posix/BUILD.gn b/security_lite/huks_posix/BUILD.gn similarity index 100% rename from security_lite/datahuks_posix/BUILD.gn rename to security_lite/huks_posix/BUILD.gn diff --git a/security_lite/datahuks_posix/Test.json b/security_lite/huks_posix/Test.json similarity index 100% rename from security_lite/datahuks_posix/Test.json rename to security_lite/huks_posix/Test.json diff --git a/security_lite/datahuks_posix/src/SecurityDataHuks.h b/security_lite/huks_posix/src/SecurityDataHuks.h similarity index 100% rename from security_lite/datahuks_posix/src/SecurityDataHuks.h rename to security_lite/huks_posix/src/SecurityDataHuks.h diff --git a/security_lite/datahuks_posix/src/SecurityDataHuksDecTest.cpp b/security_lite/huks_posix/src/SecurityDataHuksDecTest.cpp similarity index 100% rename from security_lite/datahuks_posix/src/SecurityDataHuksDecTest.cpp rename to security_lite/huks_posix/src/SecurityDataHuksDecTest.cpp diff --git a/security_lite/datahuks_posix/src/SecurityDataHuksEncTest.cpp b/security_lite/huks_posix/src/SecurityDataHuksEncTest.cpp similarity index 100% rename from security_lite/datahuks_posix/src/SecurityDataHuksEncTest.cpp rename to security_lite/huks_posix/src/SecurityDataHuksEncTest.cpp diff --git a/security_lite/datahuks_posix/src/SecurityDataHuksGenDelTest.cpp b/security_lite/huks_posix/src/SecurityDataHuksGenDelTest.cpp similarity index 100% rename from security_lite/datahuks_posix/src/SecurityDataHuksGenDelTest.cpp rename to security_lite/huks_posix/src/SecurityDataHuksGenDelTest.cpp diff --git a/security_lite/datahuks_posix/src/SecurityDataHuksHashRandomHmacTest.cpp b/security_lite/huks_posix/src/SecurityDataHuksHashRandomHmacTest.cpp similarity index 100% rename from security_lite/datahuks_posix/src/SecurityDataHuksHashRandomHmacTest.cpp rename to security_lite/huks_posix/src/SecurityDataHuksHashRandomHmacTest.cpp diff --git a/update_lite/updater_hal/BUILD.gn b/update_lite/dupdate_hal/BUILD.gn similarity index 100% rename from update_lite/updater_hal/BUILD.gn rename to update_lite/dupdate_hal/BUILD.gn diff --git a/update_lite/updater_hal/Test.tmpl b/update_lite/dupdate_hal/Test.tmpl similarity index 100% rename from update_lite/updater_hal/Test.tmpl rename to update_lite/dupdate_hal/Test.tmpl diff --git a/update_lite/updater_hal/src/ota_func_test.c b/update_lite/dupdate_hal/src/ota_func_test.c similarity index 100% rename from update_lite/updater_hal/src/ota_func_test.c rename to update_lite/dupdate_hal/src/ota_func_test.c diff --git a/update_lite/updater_posix/BUILD.gn b/update_lite/dupdate_posix/BUILD.gn similarity index 100% rename from update_lite/updater_posix/BUILD.gn rename to update_lite/dupdate_posix/BUILD.gn diff --git a/update_lite/updater_posix/Test.json b/update_lite/dupdate_posix/Test.json similarity index 100% rename from update_lite/updater_posix/Test.json rename to update_lite/dupdate_posix/Test.json diff --git a/update_lite/updater_posix/src/UpdateTest.cpp b/update_lite/dupdate_posix/src/UpdateTest.cpp similarity index 100% rename from update_lite/updater_posix/src/UpdateTest.cpp rename to update_lite/dupdate_posix/src/UpdateTest.cpp -- GitLab