From f4e2951311b42f1c004e3450a95c3bb44beb7795 Mon Sep 17 00:00:00 2001 From: zero-cyc Date: Sat, 15 Jan 2022 17:30:51 +0800 Subject: [PATCH] chenlien@huawei.com Signed-off-by: zero-cyc Change-Id: I980e220bb69acfca9e0b4291aba45e16784e19e6 --- ohos.build => bundle.json | 84 ++++++++++++++++++++++--- frameworks/ans/core/BUILD.gn | 8 +-- frameworks/ans/native/BUILD.gn | 7 +-- frameworks/wantagent/BUILD.gn | 9 ++- interfaces/kits/napi/ans/BUILD.gn | 9 ++- interfaces/kits/napi/wantagent/BUILD.gn | 13 ++-- services/ans/BUILD.gn | 10 ++- 7 files changed, 99 insertions(+), 41 deletions(-) rename ohos.build => bundle.json (36%) diff --git a/ohos.build b/bundle.json similarity index 36% rename from ohos.build rename to bundle.json index 96a234c59..0319b7bc2 100644 --- a/ohos.build +++ b/bundle.json @@ -1,16 +1,85 @@ { - "parts": { - "ans_standard": { - "module_list": [ + "name": "@ohos/distributed_notification_service", + "version": "", + "description": "为应用程序提供发布通知的能力", + "homePage": "https://gitee.com/openharmony", + "license": "Apache V2", + "repository": "https://gitee.com/openharmony/notification_ans_standard", + "domain": "os", + "language": "", + "publishAs": "code-segment", + "private": false, + "scripts": {}, + "tags": [ + "base" + ], + "keywords": [ + "notification", + "ans" + ], + "envs": [], + "dirs": [], + "author": { + "name": "", + "email": "", + "url": "" + }, + "contributors": [ + { + "name": "", + "email": "", + "url": "" + } + ], + "segment": { + "destPath": "base/notification/ans_standard" + }, + "component": { + "name": "ans_standard", + "subsystem": "notification", + "syscap": [ + "SystemCapability.DistributedNotificationService" + ], + "features": [], + "adapted_system_type": [ + "standard" + ], + "rom": "", + "ram": "", + "deps": { + "components": [ + "samgr_standard", + "ipc", + "aafwk_standard", + "dmsfwk_standard", + "multimedia_image_standard", + "hiviewdfx_hilog_native", + "appexecfwk_standard", + "time_native", + "ces_standard", + "napi", + "safwk", + "distributeddatamgr", + "os_account_innerkits" + ], + "third_party": [ + "jsoncpp", + "libuv", + "icu", + "node", + "json" + ] + }, + "build": { + "sub_component": [ "//base/notification/ans_standard/frameworks:frameworks_target", "//base/notification/ans_standard/interfaces:interfaces_target", "//base/notification/ans_standard/sa_profile:ans_sa_profile", "//base/notification/ans_standard/services:services_target", "//base/notification/ans_standard/tools:tools_target" ], - "inner_kits": [ - ], - "test_list": [ + "inner_kits": [], + "test": [ "//base/notification/ans_standard/services/ans/test/unittest:ans_unit_test", "//base/notification/ans_standard/services/test/moduletest:ans_module_test", "//base/notification/ans_standard/frameworks/ans/test/moduletest:moduletest", @@ -19,6 +88,5 @@ "//base/notification/ans_standard/test:systemtest" ] } - }, - "subsystem": "notification" + } } \ No newline at end of file diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index cf945217a..8ea2b3b94 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -82,19 +82,19 @@ ohos_shared_library("ans_core") { deps = [ "${frameworks_path}/wantagent:wantagent_innerkits", "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/kits:appkit_native", - "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] external_deps = [ + "aafwk_standard:want", + "appexecfwk_standard:appexecfwk_base", + "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimedia_image_standard:image_native", "samgr_standard:samgr_proxy", ] diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 390903624..7ee17121e 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -32,7 +32,6 @@ config("ans_innerkits_public_config") { ohos_shared_library("ans_innerkits") { include_dirs = [ "${interfaces_path}/ans/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//utils/system/safwk/native/include", "//third_party/jsoncpp/include", @@ -76,16 +75,16 @@ ohos_shared_library("ans_innerkits") { deps = [ "${frameworks_path}/ans/core:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", - "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] external_deps = [ + "aafwk_standard:want", + "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimedia_image_standard:image_native", "samgr_standard:samgr_proxy", ] diff --git a/frameworks/wantagent/BUILD.gn b/frameworks/wantagent/BUILD.gn index 7121bed12..8ca30778c 100644 --- a/frameworks/wantagent/BUILD.gn +++ b/frameworks/wantagent/BUILD.gn @@ -60,17 +60,16 @@ ohos_shared_library("wantagent_innerkits") { deps = [ "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "//foundation/appexecfwk/standard/kits:appkit_native", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ + "aafwk_standard:ability_manager", + "aafwk_standard:want", + "appexecfwk_standard:appexecfwk_base", + "appexecfwk_standard:appexecfwk_core", "ces_standard:cesfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 01c5cfad5..3bd090497 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -35,7 +35,6 @@ ohos_shared_library("notification") { include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", - "//foundation/ace/napi/interfaces/kits/napi", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "include", "//third_party/node/src", @@ -67,11 +66,7 @@ ohos_shared_library("notification") { "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", - "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "//foundation/ace/napi:ace_napi", - "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", @@ -79,9 +74,13 @@ ohos_shared_library("notification") { ] external_deps = [ + "aafwk_standard:base", + "aafwk_standard:want", "appexecfwk_standard:appexecfwk_base", + "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "napi:ace_napi", ] relative_install_dir = "module" diff --git a/interfaces/kits/napi/wantagent/BUILD.gn b/interfaces/kits/napi/wantagent/BUILD.gn index 8e9f83c18..fee5ef1d7 100644 --- a/interfaces/kits/napi/wantagent/BUILD.gn +++ b/interfaces/kits/napi/wantagent/BUILD.gn @@ -20,12 +20,8 @@ ohos_shared_library("wantagent") { "//third_party/node/src", "//foundation/aafwk/standard/services/common/include", "//utils/system/safwk/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/context", "//third_party/libuv/include", "//foundation/aafwk/standard/frameworks/kits/ability/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", "//foundation/aafwk/standard/services/common/include", @@ -40,22 +36,21 @@ ohos_shared_library("wantagent") { deps = [ "${frameworks_path}/wantagent:wantagent_innerkits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "//foundation/ace/napi:ace_napi", - "//foundation/appexecfwk/standard/kits:appkit_native", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ + "aafwk_standard:base", "aafwk_standard:want", "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "napi:ace_napi", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", ] relative_install_dir = "module" diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index 3af77500a..e38cb70e8 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -21,9 +21,6 @@ group("ans_targets") { config("public_ans_config") { include_dirs = [ "${services_path}/ans/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "//base/account/os_account/frameworks/common/database/include/", @@ -67,9 +64,7 @@ ohos_shared_library("libans") { "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", "//base/miscservices/time/services:time_service", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//utils/native/base:utils", ] @@ -77,7 +72,10 @@ ohos_shared_library("libans") { cflags = [ "-DCONFIG_DUAL_FRAMEWORK" ] } - external_deps = [] + external_deps = [ + "distributeddatamgr:distributeddata_inner", + "multimedia_image_standard:image_native", + ] external_deps += ans_standard_external_deps subsystem_name = "notification" -- Gitee