From 1782be6c18e5fefb324f585f7bb59acc5dc7adee Mon Sep 17 00:00:00 2001 From: taiyipei Date: Tue, 26 Apr 2022 05:34:45 -0700 Subject: [PATCH 1/3] build scripts opt Signed-off-by: taiyipei --- services/devicemanagerservice/BUILD.gn | 48 ++++++++++---------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 8dd66839c..a47bc93fb 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -11,12 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (defined(ohos_lite)) { - import("//build/lite/config/component/lite_component.gni") -} else { - import("//build/ohos.gni") -} - +import("//build/ohos.gni") import("//foundation/distributedhardware/devicemanager/devicemanager.gni") if (defined(ohos_lite)) { @@ -252,13 +247,8 @@ if (defined(ohos_lite)) { "${common_path}/include/ipc/model", "${utils_path}/include", "${utils_path}/include/permission/standard", - "//base/security/deviceauth/interfaces/innerkits", "//third_party/json/include", ] - - if (os_account_part_exists) { - include_dirs += [ "//base/account/os_account/interfaces/innerkits/osaccount/native/include" ] - } } ohos_shared_library("devicemanagerservice") { @@ -299,31 +289,18 @@ if (defined(ohos_lite)) { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", - "//base/security/deviceauth/services:deviceauth_sdk", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", ] - if (os_account_part_exists) { - defines += [ "OS_ACCOUNT_PART_EXISTS" ] - deps += [ "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits" ] - } - - if (!device_manager_base_no_interaction_auth) { - deps += [ - "${common_path}/include/show_confirm_dialog/dialog_ui/js:dialog_js_files_etc", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/windowmanager/wm:libwm", - ] - defines += [ "SUPPORT_GRAPHICS" ] - } external_deps = [ + "ability_base:want", + "ability_manager:ability_manager", + "ability_runtime:abilityms", "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", + "deviceauth_standard:deviceauth_sdk", "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", @@ -335,8 +312,21 @@ if (defined(ohos_lite)) { "utils_base:utils", ] - subsystem_name = "distributedhardware" + if (os_account_part_exists) { + defines += [ "OS_ACCOUNT_PART_EXISTS" ] + external_deps += [ "os_accout_standard:os_account_innerkits" ] + } + if (!device_manager_base_no_interaction_auth) { + deps += [ "${common_path}/include/show_confirm_dialog/dialog_ui/js:dialog_js_files_etc" ] + defines += [ "SUPPORT_GRAPHICS" ] + external_deps += [ + "ace_engine_standard:ui_service_mgr", + "window_manager:libwm", + ] + } + + subsystem_name = "distributedhardware" part_name = "device_manager_base" } } -- Gitee From c9959669e23ec39047e1bbdb88d3b59748d0d13d Mon Sep 17 00:00:00 2001 From: taiyipei Date: Tue, 26 Apr 2022 06:01:34 -0700 Subject: [PATCH 2/3] fix build failure Signed-off-by: taiyipei --- services/devicemanagerservice/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index a47bc93fb..91041a701 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -293,7 +293,7 @@ if (defined(ohos_lite)) { external_deps = [ "ability_base:want", - "ability_manager:ability_manager", + "ability_runtime:ability_manager", "ability_runtime:abilityms", "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", -- Gitee From a33c121fa07ea4399ae71f91d80ca5682c726b33 Mon Sep 17 00:00:00 2001 From: taiyipei Date: Wed, 27 Apr 2022 02:17:32 -0700 Subject: [PATCH 3/3] fix build failure Signed-off-by: taiyipei --- services/devicemanagerservice/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 91041a701..6b135a2dc 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -289,12 +289,12 @@ if (defined(ohos_lite)) { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", + "//foundation/aafwk/standard/services/abilitymgr:abilityms", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", - "ability_runtime:abilityms", "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", -- Gitee