From 8c69a995d0fd9abbef13b48e47a0125ac5878622 Mon Sep 17 00:00:00 2001
From: Tianshi Liu <tianshi.liu@huawei.com>
Date: Mon, 14 Mar 2022 22:38:19 +0800
Subject: [PATCH] update face auth component name

Signed-off-by: Tianshi Liu <tianshi.liu@huawei.com>
Change-Id: I29e8386baa0e735e4b90b674f0ddf8ec4a8f4d0b
---
 bundle.json                                          |  8 ++++----
 sa_profile/942.xml                                   |  4 ++--
 sa_profile/BUILD.gn                                  | 12 ++++++------
 ...face_auth_service.cfg => faceauth_sa_profile.cfg} |  8 ++++----
 .../{face_auth_service.rc => faceauth_sa_profile.rc} |  8 ++++----
 services/BUILD.gn                                    |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)
 rename sa_profile/{face_auth_service.cfg => faceauth_sa_profile.cfg} (74%)
 rename sa_profile/{face_auth_service.rc => faceauth_sa_profile.rc} (80%)

diff --git a/bundle.json b/bundle.json
index 1774007..ea03dbe 100644
--- a/bundle.json
+++ b/bundle.json
@@ -13,7 +13,7 @@
     "dirs": {},
     "scripts": {},
     "component": {
-      "name": "faceauth",
+      "name": "face_auth",
       "subsystem": "useriam",
       "adapted_system_type": [ "standard" ],
       "syscap": ["SystemCapability.UserIAM.UserAuth.FaceAuth"],
@@ -36,9 +36,9 @@
       },
       "build": {
         "sub_component": [
-          "//base/user_iam/face_auth/services:face_auth_service",
-          "//base/user_iam/face_auth/sa_profile:face_auth_service.init",
-          "//base/user_iam/face_auth/sa_profile:face_auth_sa_profile"
+          "//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"
         ],
         "inner_kits": [
         ],
diff --git a/sa_profile/942.xml b/sa_profile/942.xml
index 017e2e9..8081747 100644
--- a/sa_profile/942.xml
+++ b/sa_profile/942.xml
@@ -13,10 +13,10 @@
      limitations under the License.
 -->
 <info>
-    <process>face_service</process>
+    <process>faceauth</process>
     <systemability>
         <name>942</name>
-        <libpath>libface_auth_service.z.so</libpath>
+        <libpath>libfaceauthservice.z.so</libpath>
         <run-on-create>true</run-on-create>
         <distributed>false</distributed>
         <dump-level>1</dump-level>
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index 8fbac81..9c1c307 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -14,18 +14,18 @@
 import("//build/ohos.gni")
 import("//build/ohos/sa_profile/sa_profile.gni")
 
-ohos_sa_profile("face_auth_sa_profile") {
+ohos_sa_profile("faceauth_sa_profile") {
   sources = [ "942.xml" ]
-  part_name = "faceauth"
+  part_name = "face_auth"
 }
 
-ohos_prebuilt_etc("face_auth_service.init") {
+ohos_prebuilt_etc("faceauth_sa_profile.init") {
   if (use_musl) {
-    source = "face_auth_service.cfg"
+    source = "faceauth_sa_profile.cfg"
   } else {
-    source = "face_auth_service.rc"
+    source = "faceauth_sa_profile.rc"
   }
   relative_install_dir = "init"
   subsystem_name = "useriam"
-  part_name = "faceauth"
+  part_name = "face_auth"
 }
diff --git a/sa_profile/face_auth_service.cfg b/sa_profile/faceauth_sa_profile.cfg
similarity index 74%
rename from sa_profile/face_auth_service.cfg
rename to sa_profile/faceauth_sa_profile.cfg
index 46a575e..0291843 100644
--- a/sa_profile/face_auth_service.cfg
+++ b/sa_profile/faceauth_sa_profile.cfg
@@ -3,16 +3,16 @@
             "name" : "param:bootevent.useriam.fwkready=true",
             "condition" : "bootevent.useriam.fwkready=true",
             "cmds" : [
-                "start face_service"
+                "start faceauth"
             ]
         }
     ],
     "services" : [{
-            "name" : "face_service",
-            "path" : ["/system/bin/sa_main", "/system/profile/face_service.xml"],
+            "name" : "faceauth",
+            "path" : ["/system/bin/sa_main", "/system/profile/faceauth.xml"],
             "uid" : "system",
             "gid" : ["system", "shell"],
-            "secon" : "u:r:face_service:s0",
+            "secon" : "u:r:faceauth:s0",
             "start-mode" : "condition"
         }
     ]
diff --git a/sa_profile/face_auth_service.rc b/sa_profile/faceauth_sa_profile.rc
similarity index 80%
rename from sa_profile/face_auth_service.rc
rename to sa_profile/faceauth_sa_profile.rc
index aceb496..82fd143 100644
--- a/sa_profile/face_auth_service.rc
+++ b/sa_profile/faceauth_sa_profile.rc
@@ -12,11 +12,11 @@
 # limitations under the License.
 
 on late-fs
-    start face_service
+    start faceauth
 
-service face_service /system/bin/sa_main /system/profile/face_service.xml
-    class face_service
+service faceauth /system/bin/sa_main /system/profile/faceauth.xml
+    class faceauth
     priority -20
     user system
     group system
-    seclabel u:r:face_service:s0
+    seclabel u:r:faceauth:s0
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 1c11f73..f5e4655 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -14,7 +14,7 @@
 import("//base/user_iam/face_auth/useriam.gni")
 import("//build/ohos.gni")
 
-ohos_shared_library("face_auth_service") {
+ohos_shared_library("faceauthservice") {
   include_dirs = [
     "//foundation/multimedia/camera_standard/interfaces/inner_api/native/camera/include",
     "//base/user_iam/face_auth/services/faceauth/include",
@@ -71,5 +71,5 @@ ohos_shared_library("face_auth_service") {
     "utils_base:utils",
   ]
   subsystem_name = "useriam"
-  part_name = "faceauth"
+  part_name = "face_auth"
 }