!156 合并sa_profile文件

Merge pull request !156 from youliang_1314/master

bundle.json

@@ -35,12 +35,10 @@
       },
       "build": {
         "sub_component": [
-            "//base/user_iam/user_auth/sa_profile/user_auth:userauth_sa_profile",
+            "//base/user_iam/user_auth/sa_profile:userauth_sa_profile",
+            "//base/user_iam/user_auth/sa_profile:useriam.init",
             "//base/user_iam/user_auth/services:userauthservice",
-            "//base/user_iam/user_auth/sa_profile/co_auth:coauth_sa_profile",
-            "//base/user_iam/user_auth/sa_profile/co_auth:useriam.init",
             "//base/user_iam/user_auth/services/co_auth/common:useriam_common_lib",
-            "//base/user_iam/user_auth/sa_profile/user_idm:useridm_sa_profile",
             "//base/user_iam/user_auth/frameworks/js/napi/user_idm:useridm"
         ],
         "inner_kits": [

sa_profile/901.xml

@@ -16,7 +16,7 @@
     <process>useriam</process>
     <systemability>
         <name>901</name>
-        <libpath>libuseridmservice.z.so</libpath>
+        <libpath>libuserauthservice.z.so</libpath>
         <run-on-create>true</run-on-create>
         <distributed>false</distributed>
         <dump-level>1</dump-level>

sa_profile/931.xml

@@ -16,7 +16,7 @@
     <process>useriam</process>
     <systemability>
         <name>931</name>
-        <libpath>libcoauthservice.z.so</libpath>
+        <libpath>libuserauthservice.z.so</libpath>
         <run-on-create>true</run-on-create>
         <distributed>false</distributed>
         <dump-level>1</dump-level>

sa_profile/BUILD.gn

@@ -14,8 +14,12 @@
 import("//build/ohos.gni")
 import("//build/ohos/sa_profile/sa_profile.gni")
 
-ohos_sa_profile("coauth_sa_profile") {
-  sources = [ "931.xml" ]
+ohos_sa_profile("userauth_sa_profile") {
+  sources = [
+    "901.xml",
+    "921.xml",
+    "931.xml",
+  ]
   part_name = "user_auth"
 }
 

sa_profile/user_auth/BUILD.gn

@@ -1,20 +0,0 @@
-# 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.
-
-import("//build/ohos.gni")
-import("//build/ohos/sa_profile/sa_profile.gni")
-
-ohos_sa_profile("userauth_sa_profile") {
-  sources = [ "921.xml" ]
-  part_name = "user_auth"
-}

sa_profile/user_idm/BUILD.gn

@@ -1,20 +0,0 @@
-# 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.
-
-import("//build/ohos.gni")
-import("//build/ohos/sa_profile/sa_profile.gni")
-
-ohos_sa_profile("useridm_sa_profile") {
-  sources = [ "901.xml" ]
-  part_name = "user_auth"
-}