diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 195d473b402b363ddde3bb9df2654c1265af3ce3..1e82f7af09b89f94bcfcd47a4d4117de3eb34476 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -22,7 +22,7 @@ if (defined(ohos_lite)) { shared_library("devicemanagersdk") { } } else { - ohos_shared_library("devicemanagersdk") { + config("devicemanagersdk_config") { include_dirs = [ "include", "include/ipc", @@ -31,15 +31,10 @@ if (defined(ohos_lite)) { "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/model", - "${utils_path}/include", - "${utils_path}/include/ipc/standard", - "//third_party/json/include", - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", ] + } + ohos_shared_library("devicemanagersdk") { sources = [ "src/device_manager.cpp", "src/device_manager_impl.cpp", @@ -51,11 +46,7 @@ if (defined(ohos_lite)) { "src/notify/device_manager_notify.cpp", ] - deps = [ - "${utils_path}:devicemanagerutils", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//utils/native/base:utils", - ] + public_configs = [ ":devicemanagersdk_config" ] defines = [ "HI_LOG_ENABLE", @@ -63,15 +54,15 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] + deps = [ "${utils_path}:devicemanagerutils" ] + external_deps = [ - "ability_runtime:app_manager", - "bundle_framework:appexecfwk_base", + "ability_runtime:want", "bundle_framework:appexecfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "resmgr_standard:global_resmgr", - "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "utils_base:utils", ] subsystem_name = "distributedhardware" diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index f4359edcc645959257b185de9c1af264a2656d47..08bbd85848bbd086ca28e93144a59c26ea5f21f0 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -24,7 +24,7 @@ if (defined(ohos_lite)) { sources = [ "src/ipc/lite/ipc_server_main.cpp" ] } } else { - ohos_shared_library("devicemanagerservice") { + config("devicemanagerservice_config") { include_dirs = [ "include", "include/config", @@ -44,22 +44,12 @@ if (defined(ohos_lite)) { "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/model", - "${utils_path}/include", - "${utils_path}/include/ipc/standard", - "${innerkits_path}/native_cpp/include", - "${innerkits_path}/native_cpp/include/ipc", - "${innerkits_path}/native_cpp/include/ipc/standard", - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//base/notification/ces_standard/frameworks/core/include", - "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/interfaces/kits", - "//base/startup/syspara_lite/adapter/native/syspara/include", "//third_party/json/include", - "//third_party/flutter/skia", ] + } + ohos_shared_library("devicemanagerservice") { sources = [ "src/ability/standard/dm_ability_manager.cpp", "src/adapter/standard/dm_adapter_manager.cpp", @@ -85,27 +75,28 @@ if (defined(ohos_lite)) { "src/ipc/standard/ipc_server_stub.cpp", ] + public_configs = [ ":devicemanagerservice_config" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerservice\"", + "LOG_DOMAIN=0xD004100", + ] + deps = [ "${common_path}/include/dialog_ui/js:dialog_js_files_etc", "${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", "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/windowmanager/wm:libwm", - "//utils/native/base:utils", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"devicemanagerservice\"", - "LOG_DOMAIN=0xD004100", ] external_deps = [ + "ability_runtime:ability_manager", "ability_runtime:app_manager", + "ability_runtime:want", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", @@ -118,6 +109,7 @@ if (defined(ohos_lite)) { "samgr_standard:samgr_proxy", "startup_l2:syspara", "startup_l2:syspara_watchagent", + "utils_base:utils", ] subsystem_name = "distributedhardware" diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 6fb1469ccb7768533cd4a7f7ce9a3d46727be4d7..7080341e1f3ff8f63d0eb2955960a14cd2b550b7 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -23,20 +23,17 @@ if (defined(ohos_lite)) { shared_library("devicemanagerutils") { } } else { - ohos_shared_library("devicemanagerutils") { + config("devicemanagerutils_config") { include_dirs = [ + "include", + "include/ipc/standard", "${common_path}/include", "${common_path}/include/ipc", "${common_path}/include/ipc/model", - "include", - "include/ipc/standard", - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//base/security/deviceauth/interfaces/innerkits", - "//base/startup/syspara_lite/adapter/native/syspara/include", - "//third_party/json/include", ] + } + ohos_shared_library("devicemanagerutils") { sources = [ "src/dm_anonymous.cpp", "src/dm_log.cpp", @@ -44,10 +41,7 @@ if (defined(ohos_lite)) { "src/ipc/standard/ipc_cmd_register.cpp", ] - deps = [ - "//third_party/mbedtls:mbedtls_shared", - "//utils/native/base:utils", - ] + public_configs = [ ":devicemanagerutils_config" ] defines = [ "HI_LOG_ENABLE", @@ -55,9 +49,12 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] + deps = [ "//third_party/mbedtls:mbedtls_shared" ] + external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "utils_base:utils", ] subsystem_name = "distributedhardware"