!154 service对应的so文件合并

Merge pull request !154 from youliang_1314/master
This commit is contained in:
openharmony_ci
2022-05-05 06:14:23 +00:00
committed by Gitee
4 changed files with 32 additions and 123 deletions
+1 -3
View File
@@ -36,13 +36,11 @@
"build": {
"sub_component": [
"//base/user_iam/user_auth/sa_profile/user_auth:userauth_sa_profile",
"//base/user_iam/user_auth/services/user_auth:userauthservice",
"//base/user_iam/user_auth/services:userauthservice",
"//base/user_iam/user_auth/sa_profile/co_auth:coauth_sa_profile",
"//base/user_iam/user_auth/services/co_auth:coauthservice",
"//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/services/user_idm:useridmservice",
"//base/user_iam/user_auth/frameworks/js/napi/user_idm:useridm"
],
"inner_kits": [
@@ -22,19 +22,41 @@ if (!defined(global_parts_info) ||
ohos_shared_library("userauthservice") {
include_dirs = [
"inc",
"//base/user_iam/user_auth/services/user_auth/inc",
"//base/user_iam/user_auth/services/co_auth/inc",
"//base/user_iam/user_auth/services/co_auth/common/interface",
"//base/user_iam/user_auth/common/logs/user_idm",
"//base/user_iam/user_auth/services/user_idm/inc",
"//base/user_iam/user_auth/frameworks/user_idm/inc",
"//base/user_iam/user_auth/interfaces/inner_api/user_idm",
]
sources = [
"src/userauth_adapter.cpp",
"src/userauth_async_proxy.cpp",
"src/userauth_controller.cpp",
"src/userauth_datamgr.cpp",
"src/userauth_excallback_impl.cpp",
"src/userauth_service.cpp",
"src/userauth_stub.cpp",
"co_auth/src/auth_res_manager.cpp",
"co_auth/src/auth_res_pool.cpp",
"co_auth/src/call_monitor.cpp",
"co_auth/src/coauth_manager.cpp",
"co_auth/src/coauth_service.cpp",
"co_auth/src/coauth_stub.cpp",
"co_auth/src/coauth_thread_pool.cpp",
"co_auth/src/executor_messenger.cpp",
"user_auth/src/userauth_adapter.cpp",
"user_auth/src/userauth_async_proxy.cpp",
"user_auth/src/userauth_controller.cpp",
"user_auth/src/userauth_datamgr.cpp",
"user_auth/src/userauth_excallback_impl.cpp",
"user_auth/src/userauth_service.cpp",
"user_auth/src/userauth_stub.cpp",
"user_idm/src/useridm_adapter.cpp",
"user_idm/src/useridm_callback_proxy.cpp",
"user_idm/src/useridm_coauth_handler.cpp",
"user_idm/src/useridm_controller.cpp",
"user_idm/src/useridm_getinfo_callback_proxy.cpp",
"user_idm/src/useridm_getsecinfo_callback_proxy.cpp",
"user_idm/src/useridm_module.cpp",
"user_idm/src/useridm_service.cpp",
"user_idm/src/useridm_setprop_handler.cpp",
"user_idm/src/useridm_stub.cpp",
]
deps = [
@@ -48,6 +70,7 @@ ohos_shared_library("userauthservice") {
external_deps = [
"access_token:libaccesstoken_sdk",
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
-52
View File
@@ -1,52 +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")
ohos_shared_library("coauthservice") {
include_dirs = [
"inc",
"common/interface",
]
sources = [
"src/auth_res_manager.cpp",
"src/auth_res_pool.cpp",
"src/call_monitor.cpp",
"src/coauth_manager.cpp",
"src/coauth_service.cpp",
"src/coauth_stub.cpp",
"src/coauth_thread_pool.cpp",
"src/executor_messenger.cpp",
]
configs = [ "//base/user_iam/user_auth/common:iam_log_config" ]
deps = [
"//base/user_iam/user_auth/frameworks/co_auth:coauth_framework",
"//base/user_iam/user_auth/services/co_auth/common:useriam_common_lib",
]
external_deps = [
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"startup_l2:syspara",
"utils_base:utils",
]
part_name = "user_auth"
subsystem_name = "useriam"
}
-60
View File
@@ -1,60 +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")
config("useridm_public_config") {
include_dirs = [ "inc" ]
}
ohos_shared_library("useridmservice") {
include_dirs = [
"//base/user_iam/user_auth/common/logs/user_idm",
"//base/user_iam/user_auth/services/user_idm/inc",
"//base/user_iam/user_auth/frameworks/user_idm/inc",
"//base/user_iam/user_auth/interfaces/inner_api/user_idm",
"//base/user_iam/user_auth/services/co_auth/common/interface",
]
sources = [
"src/useridm_adapter.cpp",
"src/useridm_callback_proxy.cpp",
"src/useridm_coauth_handler.cpp",
"src/useridm_controller.cpp",
"src/useridm_getinfo_callback_proxy.cpp",
"src/useridm_getsecinfo_callback_proxy.cpp",
"src/useridm_module.cpp",
"src/useridm_service.cpp",
"src/useridm_setprop_handler.cpp",
"src/useridm_stub.cpp",
]
public_configs = [ ":useridm_public_config" ]
deps = [
"//base/user_iam/user_auth/frameworks/co_auth:coauth_framework",
"//base/user_iam/user_auth/frameworks/user_idm:useridm_framework",
"//base/user_iam/user_auth/services/co_auth/common:useriam_common_lib",
]
external_deps = [
"access_token:libaccesstoken_sdk",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"safwk:system_ability_fwk",
"samgr_standard:samgr_proxy",
"utils_base:utils",
]
part_name = "user_auth"
}