From 5501037c13ba0be496601879cad589e1b263c8ef Mon Sep 17 00:00:00 2001 From: caohongfei2 Date: Tue, 14 Jun 2022 14:14:41 +0800 Subject: [PATCH] =?UTF-8?q?useriam=E9=83=A8=E4=BB=B6=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9:=E9=83=A8=E4=BB=B6=E5=90=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: caohongfei2 Change-Id: I5e99a5adf76494f589dd778c76fc2cfc86d86bb1 --- README.md | 2 +- README_ZH.md | 2 +- bundle.json | 18 +++++++++--------- frameworks/face_auth/BUILD.gn | 8 ++++---- services/BUILD.gn | 12 ++++++------ .../faceauthexecutorhdi_fuzzer/BUILD.gn | 18 +++++++++--------- test/fuzztest/faceauthservice_fuzzer/BUILD.gn | 16 ++++++++-------- test/unittest/BUILD.gn | 18 +++++++++--------- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 9776439..8f89a53 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Note 1: The OpenHarmony open-source framework provides stub implementation of fa ## Directory Structure ``` -//base/user_iam/face_auth +//base/useriam/face_auth ├── bundle.json # Module description file ├── figures # Figures used in the README ├── sa_profile # Service ability profile diff --git a/README_ZH.md b/README_ZH.md index 22e052a..2783b9e 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -25,7 +25,7 @@ ## 目录 ``` -//base/user_iam/face_auth +//base/useriam/face_auth ├── bundle.json # 组件描述文件 ├── common # 组件公共文件 ├── figures # README使用的图片 diff --git a/bundle.json b/bundle.json index c0bfa42..ba993f7 100644 --- a/bundle.json +++ b/bundle.json @@ -8,7 +8,7 @@ "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath" : "base/user_iam/face_auth" + "destPath" : "base/useriam/face_auth" }, "dirs": {}, "scripts": {}, @@ -28,31 +28,31 @@ "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "user_auth:coauth_framework", + "user_auth_framework:coauth_framework", "utils_base:utils" ] }, "build": { "sub_component": [ - "//base/user_iam/face_auth/services:faceauthservice", - "//base/user_iam/face_auth/sa_profile:faceauth_sa_profile.init", - "//base/user_iam/face_auth/sa_profile:faceauth_sa_profile" + "//base/useriam/face_auth/services:faceauthservice", + "//base/useriam/face_auth/sa_profile:faceauth_sa_profile.init", + "//base/useriam/face_auth/sa_profile:faceauth_sa_profile" ], "inner_kits": [ { "type": "so", - "name": "//base/user_iam/face_auth/frameworks/face_auth:faceauth_framework", + "name": "//base/useriam/face_auth/frameworks/face_auth:faceauth_framework", "header": { "header_files": [ "face_auth_innerkit.h" ], - "header_base": "//base/user_iam/face_auth/interfaces/inner_api/face_auth/" + "header_base": "//base/useriam/face_auth/interfaces/inner_api/face_auth/" } } ], "test": [ - "//base/user_iam/face_auth/test/fuzztest:fuzztest", - "//base/user_iam/face_auth/test/unittest:unittest" + "//base/useriam/face_auth/test/fuzztest:fuzztest", + "//base/useriam/face_auth/test/unittest:unittest" ] } } diff --git a/frameworks/face_auth/BUILD.gn b/frameworks/face_auth/BUILD.gn index 71dd492..812e356 100644 --- a/frameworks/face_auth/BUILD.gn +++ b/frameworks/face_auth/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/ability/ability_runtime/aafwk.gni") config("faceauth_framework_public_config") { include_dirs = [ - "//base/user_iam/face_auth/interfaces/inner_api/face_auth", + "//base/useriam/face_auth/interfaces/inner_api/face_auth", "inc", ] } @@ -31,11 +31,11 @@ ohos_shared_library("faceauth_framework") { public_configs = [ ":faceauth_framework_public_config" ] - configs = [ "//base/user_iam/user_auth/common:iam_log_config" ] + configs = [ "//base/useriam/user_auth_framework/common:iam_log_config" ] include_dirs = [ - "//base/user_iam/user_auth/common/utils", - "//base/user_iam/face_auth/common/inc", + "//base/useriam/user_auth_framework/common/utils", + "//base/useriam/face_auth/common/inc", ] if (ability_runtime_graphics) { diff --git a/services/BUILD.gn b/services/BUILD.gn index 6cbc56e..ca9beb5 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -24,21 +24,21 @@ ohos_shared_library("faceauthservice") { ] include_dirs = [ "inc", - "//base/user_iam/face_auth/common/inc", - "//base/user_iam/user_auth/common/logs", - "//base/user_iam/user_auth/common/utils", + "//base/useriam/face_auth/common/inc", + "//base/useriam/user_auth_framework/common/logs", + "//base/useriam/user_auth_framework/common/utils", ] deps = [ - "//base/user_iam/face_auth/frameworks/face_auth:faceauth_framework", - "//base/user_iam/user_auth/common/executors:userauth_executors", + "//base/useriam/face_auth/frameworks/face_auth:faceauth_framework", + "//base/useriam/user_auth_framework/common/executors:userauth_executors", ] external_deps = [ "face_auth_device_driver_interface:libface_auth_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "user_auth:coauth_framework", + "user_auth_framework:coauth_framework", "utils_base:utils", ] remove_configs = [ "//build/config/compiler:no_exceptions" ] diff --git a/test/fuzztest/faceauthexecutorhdi_fuzzer/BUILD.gn b/test/fuzztest/faceauthexecutorhdi_fuzzer/BUILD.gn index d0cc080..d8b7f81 100644 --- a/test/fuzztest/faceauthexecutorhdi_fuzzer/BUILD.gn +++ b/test/fuzztest/faceauthexecutorhdi_fuzzer/BUILD.gn @@ -18,7 +18,7 @@ import("//foundation/ability/ability_runtime/aafwk.gni") ohos_fuzztest("FaceAuthExecutorHdiFuzzTest") { module_out_path = "useriam/face_auth" fuzz_config_file = - "//base/user_iam/face_auth/test/fuzztest/faceauthexecutorhdi_fuzzer" + "//base/useriam/face_auth/test/fuzztest/faceauthexecutorhdi_fuzzer" cflags = [ "-g", "-O0", @@ -26,25 +26,25 @@ ohos_fuzztest("FaceAuthExecutorHdiFuzzTest") { "-fno-omit-frame-pointer", ] include_dirs = [ - "//base/user_iam/face_auth/common/inc", - "//base/user_iam/user_auth/common/logs", - "//base/user_iam/user_auth/common/utils", - "//base/user_iam/face_auth/services/inc", + "//base/useriam/face_auth/common/inc", + "//base/useriam/user_auth_framework/common/logs", + "//base/useriam/user_auth_framework/common/utils", + "//base/useriam/face_auth/services/inc", ] sources = [ "face_auth_executor_hdi_fuzzer.cpp" ] deps = [ - "//base/user_iam/face_auth/services:faceauthservice", - "//base/user_iam/user_auth/common:iam_test", - "//base/user_iam/user_auth/common/executors:userauth_executors", + "//base/useriam/face_auth/services:faceauthservice", + "//base/useriam/user_auth_framework/common:iam_test", + "//base/useriam/user_auth_framework/common/executors:userauth_executors", ] external_deps = [ "face_auth_device_driver_interface:libface_auth_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "user_auth:coauth_framework", + "user_auth_framework:coauth_framework", ] remove_configs = [ "//build/config/compiler:no_exceptions" ] diff --git a/test/fuzztest/faceauthservice_fuzzer/BUILD.gn b/test/fuzztest/faceauthservice_fuzzer/BUILD.gn index 6b1e23a..6b9e605 100644 --- a/test/fuzztest/faceauthservice_fuzzer/BUILD.gn +++ b/test/fuzztest/faceauthservice_fuzzer/BUILD.gn @@ -18,7 +18,7 @@ import("//foundation/ability/ability_runtime/aafwk.gni") ohos_fuzztest("FaceAuthServiceFuzzTest") { module_out_path = "useriam/face_auth" fuzz_config_file = - "//base/user_iam/face_auth/test/fuzztest/faceauthservice_fuzzer" + "//base/useriam/face_auth/test/fuzztest/faceauthservice_fuzzer" cflags = [ "-g", "-O0", @@ -27,18 +27,18 @@ ohos_fuzztest("FaceAuthServiceFuzzTest") { ] include_dirs = [ - "//base/user_iam/face_auth/common/inc", - "//base/user_iam/user_auth/common/logs", - "//base/user_iam/user_auth/common/utils", - "//base/user_iam/face_auth/services/inc", + "//base/useriam/face_auth/common/inc", + "//base/useriam/user_auth_framework/common/logs", + "//base/useriam/user_auth_framework/common/utils", + "//base/useriam/face_auth/services/inc", ] sources = [ "face_auth_service_fuzzer.cpp" ] deps = [ - "//base/user_iam/face_auth/frameworks/face_auth:faceauth_framework", - "//base/user_iam/face_auth/services:faceauthservice", - "//base/user_iam/user_auth/common:iam_test", + "//base/useriam/face_auth/frameworks/face_auth:faceauth_framework", + "//base/useriam/face_auth/services:faceauthservice", + "//base/useriam/user_auth_framework/common:iam_test", ] external_deps = [ "safwk:system_ability_fwk" ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 5bb769c..b2b2ace 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -14,7 +14,7 @@ import("//build/test.gni") ohos_unittest("FaceAuthServiceUnitTest") { - module_out_path = "user_iam/face_auth" + module_out_path = "useriam/face_auth" sources = [ "face_auth_driver_hdi_unit_test.cpp", @@ -24,16 +24,16 @@ ohos_unittest("FaceAuthServiceUnitTest") { include_dirs = [ "mock", - "//base/user_iam/user_auth/common/logs", - "//base/user_iam/user_auth/common/utils", - "//base/user_iam/user_auth/common/executors/include/public", - "//base/user_iam/face_auth/common/inc", - "//base/user_iam/face_auth/services/inc", - "//base/user_iam/user_auth/interfaces/inner_api/co_auth/", + "//base/useriam/user_auth_framework/common/logs", + "//base/useriam/user_auth_framework/common/utils", + "//base/useriam/user_auth_framework/common/executors/include/public", + "//base/useriam/face_auth/common/inc", + "//base/useriam/face_auth/services/inc", + "//base/useriam/user_auth_framework/interfaces/inner_api/co_auth/", ] deps = [ - "//base/user_iam/face_auth/services:faceauthservice", + "//base/useriam/face_auth/services:faceauthservice", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -42,7 +42,7 @@ ohos_unittest("FaceAuthServiceUnitTest") { "face_auth_device_driver_interface:libface_auth_proxy_1.0", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "user_auth:coauth_framework", + "user_auth_framework:coauth_framework", "utils_base:utils", ] remove_configs = [ "//build/config/compiler:no_exceptions" ]