diff --git a/bundle.json b/bundle.json index fa3215a6c50ffd7ac737e99005b38d8588f7bc4d..47ec4cac15db8662119cab675c75fda064e9350f 100644 --- a/bundle.json +++ b/bundle.json @@ -74,7 +74,7 @@ "access_token", "ipc", "multimedia_player_framework", - "multimedia_image_standard", + "multimedia_image_framework", "eventhandler", "utils_base" ], diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index e8046f06da6b1a9aca152e31d908d6fac1a9d858..ad98fb36f63c07ebfbdae8059d5f7e173e2d141c 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -30,7 +30,7 @@ config("ans_innerkits_public_config") { ] configs = [ "${ability_runtime_inner_api_path}/wantagent:wantagent_innerkits_public_config", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_external_config", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_external_config", ] } @@ -86,7 +86,7 @@ ohos_shared_library("ans_innerkits") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "samgr:samgr_proxy", ] diff --git a/frameworks/ans/test/unittest/BUILD.gn b/frameworks/ans/test/unittest/BUILD.gn index bfc7c602afdfb2e41253fbbc7cb7ad4bda682ebe..a616b76588d54df8b9fb019b1616af5eb75d1c3d 100644 --- a/frameworks/ans/test/unittest/BUILD.gn +++ b/frameworks/ans/test/unittest/BUILD.gn @@ -52,12 +52,12 @@ ohos_unittest("ans_reminder_unit_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn index 64dabc7cff5486587cda8778664192ff22d897ef..a061c3fabf43e0017d3ebc75f96fb2fd6f5b3e74 100644 --- a/frameworks/core/BUILD.gn +++ b/frameworks/core/BUILD.gn @@ -89,7 +89,7 @@ ohos_shared_library("ans_core") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "os_account:os_account_innerkits", "relational_store:native_rdb", "samgr:samgr_proxy", diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn index 911b053675514cd5b9161b84bc99a17e0303533b..491ac5fbb7799367c9cbfd5a7351fe84f0e07a39 100644 --- a/frameworks/js/napi/BUILD.gn +++ b/frameworks/js/napi/BUILD.gn @@ -38,7 +38,7 @@ ohos_shared_library("notification") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_napi_path}/inner/napi_common", - "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", + "//foundation/multimedia/image_framework/interfaces/kits/js/common/include/", "include", "//third_party/node/src", "//third_party/libuv/include", @@ -69,16 +69,20 @@ ohos_shared_library("notification") { "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${ability_runtime_path}/frameworks/native/appkit:app_context", "${core_path}:ans_core", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "${frameworks_module_ans_path}:ans_innerkits", + "//foundation/multimedia/image_framework/interfaces/innerkits:image", + "//third_party/libuv:uv_static", ] external_deps = [ + "ability_base:base", "ability_base:want", "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", "napi:ace_napi", "relational_store:native_rdb", ] diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn index 4c572a692665b80b114368029f32694d2d43d1ec..e074eaf14fd02b0c3eef02f3912ce7d9941bfa5c 100644 --- a/frameworks/js/napi/src/reminder/BUILD.gn +++ b/frameworks/js/napi/src/reminder/BUILD.gn @@ -30,7 +30,7 @@ ohos_shared_library("reminderagent") { include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_napi_path}/inner/napi_common", - "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", + "//foundation/multimedia/image_framework/interfaces/kits/js/common/include/", "../../include", "//third_party/node/src", "//third_party/libuv/include", @@ -49,7 +49,9 @@ ohos_shared_library("reminderagent") { deps = [ "${ability_runtime_napi_path}/inner/napi_common:napi_common", "${core_path}:ans_core", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "${frameworks_module_ans_path}:ans_innerkits", + "//foundation/multimedia/image_framework/interfaces/innerkits:image", + "//third_party/libuv:uv_static", ] external_deps = [ @@ -57,8 +59,10 @@ ohos_shared_library("reminderagent") { "ability_base:zuri", "ability_runtime:abilitykit_native", "ability_runtime:wantagent_innerkits", + "bundle_framework:appexecfwk_base", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", "napi:ace_napi", "relational_store:native_rdb", ] diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn index d4a7dd4800ea120fa26b605c6b5b328e1032279e..562f15b15364cbf1a03634a118ed7b24800a20bc 100644 --- a/frameworks/test/moduletest/BUILD.gn +++ b/frameworks/test/moduletest/BUILD.gn @@ -85,11 +85,11 @@ ohos_moduletest("ans_fw_module_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -160,11 +160,11 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -233,11 +233,11 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", @@ -305,11 +305,11 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index 0570bf863cdbe9047f08a9689a17034470897727..8095bf98dfd84ad18588173d7d07a301a0049410 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -71,9 +71,9 @@ ohos_shared_library("libans") { "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "c_utils:utils", + "distributeddatamgr:distributeddata_inner", "hitrace_native:hitrace_meter", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "multimedia_player_framework:media_client", "os_account:os_account_innerkits", "time_service:time_service", diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index de4aa72a761e0b8c56be6663307e94f5e88fad94..a9a27521696cabb5a2edab1a4c809d22e47561db 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -87,13 +87,13 @@ ohos_unittest("ans_unit_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "multimedia_player_framework:media_client", "os_account:os_account_innerkits", "safwk:system_ability_fwk", diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index 3af9f23998ab4c9adfa26887cdef2a612b0982be..39e3031e8732ffc30529a7ec149979de5be87352 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -48,10 +48,12 @@ ohos_shared_library("libans_distributed") { "ability_base:want", "ability_base:zuri", "c_utils:utils", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "kv_store:distributeddata_inner", + "ipc:ipc_core", + "multimedia_image_framework:image_native", ] subsystem_name = "${subsystem_name}" diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 6a76e1ce2acc06fa132abd8ab58b77a85631f116..cb56423722cd1b6d8e1a1a54e72d745c58e46ad9 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -69,13 +69,13 @@ ohos_unittest("ans_distributed_unit_test") { "ability_base:zuri", "bundle_framework:appexecfwk_base", "c_utils:utils", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:hitrace_meter", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", ] subsystem_name = "${subsystem_name}" diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index 476199db39d651568d82869c253dc622ab959b52..9659a3e266cf68e1a8430aacc004bc10cf728aa7 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -74,14 +74,14 @@ ohos_moduletest("ans_module_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "kv_store:distributeddata_inner", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "multimedia_player_framework:media_client", "os_account:os_account_innerkits", "safwk:system_ability_fwk", diff --git a/test/bechmarktest/notification_publish_test/BUILD.gn b/test/bechmarktest/notification_publish_test/BUILD.gn index 08c26a40e9ae7ba7cdae0b05ea8177033228c1e7..dcb0a36054a02d318dc5ca7f80c8988fb7622127 100644 --- a/test/bechmarktest/notification_publish_test/BUILD.gn +++ b/test/bechmarktest/notification_publish_test/BUILD.gn @@ -37,7 +37,7 @@ ohos_benchmarktest("Benchmark_Publish_Test") { "ability_base:zuri", "ability_runtime:wantagent_innerkits", "c_utils:utils", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] subsystem_name = "${subsystem_name}" diff --git a/test/bechmarktest/notification_services_test/BUILD.gn b/test/bechmarktest/notification_services_test/BUILD.gn index 5db99f4461da96cc225a1af7456dbfd05fb87e59..a38d7a44f32f45a4634ca30dacdd8fb4b27c50fd 100644 --- a/test/bechmarktest/notification_services_test/BUILD.gn +++ b/test/bechmarktest/notification_services_test/BUILD.gn @@ -44,7 +44,7 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") { "ability_runtime:wantagent_innerkits", "c_utils:utils", "common_event_service:cesfwk_innerkits", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] subsystem_name = "${subsystem_name}" diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 80684bdbe0806013d265c47f17800514ae58d115..b1c67bf2da34d6507d1297e6f6ee36b16670d994 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -71,7 +71,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_appdatafwk", "relational_store:native_dataability", "relational_store:native_rdb", diff --git a/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn b/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn index e4d87870c7f48012f71dceecddbfcbc79eff34ff..a1d56add3e49130625445e1dacf30efeb89acd59 100644 --- a/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn +++ b/test/fuzztest/addnotificationslots_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("AddNotificationSlotsFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn index 87afcae0572a4f9fdc8c2fd2326be9af426a59fe..1e9646ea405d7f26add6cc13cc3d5286b717c7d3 100644 --- a/test/fuzztest/addslotbytype_fuzzer/BUILD.gn +++ b/test/fuzztest/addslotbytype_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("AddSlotByTypeFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/cancelnotification_fuzzer/BUILD.gn b/test/fuzztest/cancelnotification_fuzzer/BUILD.gn index 1e9c69bc78eb1cd330e06643b21905ce3ef5a7ce..a22f265c678aa4e9a9463caf5e1727e8f9efbe24 100644 --- a/test/fuzztest/cancelnotification_fuzzer/BUILD.gn +++ b/test/fuzztest/cancelnotification_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("CancelNotificationFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn b/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn index e4c124e11b21f9b86aad3946a50c1ba8359d3b3e..bad353a75151de88b40fdb368f5bf2c6a285c2a4 100644 --- a/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn +++ b/test/fuzztest/getnotificationslot_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("GetNotificationSlotFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn b/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn index 931dc534821b9c9a473fbb4ad0e8cd4ee7089db8..a136ed6583f42973ec48d731485edd204e2ada31 100644 --- a/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn +++ b/test/fuzztest/getnotificationslotnumasbundle_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("GetNotificationSlotNumAsBundleFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/publishnotification_fuzzer/BUILD.gn b/test/fuzztest/publishnotification_fuzzer/BUILD.gn index a202ab689d4d55ad77eb2bed34d73ed9af8d9915..1ee8b4ee91ddd1d660b365bb4508ae06758c74eb 100644 --- a/test/fuzztest/publishnotification_fuzzer/BUILD.gn +++ b/test/fuzztest/publishnotification_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("PublishNotificationFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/removenotification_fuzzer/BUILD.gn b/test/fuzztest/removenotification_fuzzer/BUILD.gn index cc8a80556b95f25dcab74a1007b5ab890362afd9..2f30b461fb92a88e285487dcce2f39079622eb90 100644 --- a/test/fuzztest/removenotification_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotification_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("RemoveNotificationFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn b/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn index 1ad0cdedf4e56441964d575cffb611b4dee6ff4d..e8bceb32575933f71e758c117318dd274700528f 100644 --- a/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn +++ b/test/fuzztest/removenotificationslot_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("RemoveNotificationSlotFuzzTest") { "ability_base:zuri", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn b/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn index 49162f6eb3fdf3bebc0ed2b751efd06abb8ce143..0654c3f07f2ff39e8387e1f296b12798741d5c0c 100644 --- a/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn +++ b/test/fuzztest/setnotificationbadgenum_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("SetNotificationBadgeNumFuzzTest") { "ability_base:want", "ability_base:zuri", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] } diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index c13860b62b64ba4a9b612def7806823511f0e484..50bab0a47d88768a19e621272869f2e2d21a18f7 100644 --- a/tools/dump/BUILD.gn +++ b/tools/dump/BUILD.gn @@ -51,7 +51,7 @@ ohos_executable("anm") { external_deps = [ "c_utils:utils", "hiviewdfx_hilog_native:libhilog", - "multimedia_image_standard:image_native", + "multimedia_image_framework:image_native", "relational_store:native_rdb", ] external_deps += component_external_deps