diff --git a/bundle.json b/bundle.json index 745e4c1..71da276 100644 --- a/bundle.json +++ b/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": [ diff --git a/sa_profile/user_idm/901.xml b/sa_profile/901.xml similarity index 100% rename from sa_profile/user_idm/901.xml rename to sa_profile/901.xml diff --git a/sa_profile/user_auth/921.xml b/sa_profile/921.xml similarity index 100% rename from sa_profile/user_auth/921.xml rename to sa_profile/921.xml diff --git a/sa_profile/co_auth/931.xml b/sa_profile/931.xml similarity index 100% rename from sa_profile/co_auth/931.xml rename to sa_profile/931.xml diff --git a/sa_profile/co_auth/BUILD.gn b/sa_profile/BUILD.gn similarity index 89% rename from sa_profile/co_auth/BUILD.gn rename to sa_profile/BUILD.gn index ed75794..fc03620 100644 --- a/sa_profile/co_auth/BUILD.gn +++ b/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" } diff --git a/sa_profile/user_auth/BUILD.gn b/sa_profile/user_auth/BUILD.gn deleted file mode 100644 index 6da4cc9..0000000 --- a/sa_profile/user_auth/BUILD.gn +++ /dev/null @@ -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" -} diff --git a/sa_profile/user_idm/BUILD.gn b/sa_profile/user_idm/BUILD.gn deleted file mode 100644 index fb80bd6..0000000 --- a/sa_profile/user_idm/BUILD.gn +++ /dev/null @@ -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" -} diff --git a/sa_profile/co_auth/useriam.cfg b/sa_profile/useriam.cfg similarity index 100% rename from sa_profile/co_auth/useriam.cfg rename to sa_profile/useriam.cfg diff --git a/sa_profile/co_auth/useriam_bionic.cfg b/sa_profile/useriam_bionic.cfg similarity index 100% rename from sa_profile/co_auth/useriam_bionic.cfg rename to sa_profile/useriam_bionic.cfg