diff --git a/BUILD.gn b/BUILD.gn index 8fec348..2bbdfe9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") ################################################################################ -group("wallpaper_native_packages") { +group("wallpaper_mgr_packages") { if (is_standard_system) { deps = [ "etc/init:wallpaperservice.rc", diff --git a/bundle.json b/bundle.json index df4700b..5f61c7d 100644 --- a/bundle.json +++ b/bundle.json @@ -1,17 +1,17 @@ { - "name": "@ohos/wallpaper", + "name": "@ohos/wallpaper_mgr", "description": "Allowing apps to use OS wallpaper get/set functions", "version": "3.1", "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "base/miscservices/wallpaper" + "destPath": "base/theme/wallpaper_mgr" }, "dirs": {}, "scripts": {}, "component": { - "name": "wallpaper_native", - "subsystem": "miscservices", + "name": "wallpaper_mgr", + "subsystem": "theme", "syscap": [ "SystemCapability.MiscServices.Wallpaper" ], @@ -49,24 +49,24 @@ }, "build": { "sub_component": [ - "//base/miscservices/wallpaper:wallpaper_native_packages", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", - "//base/miscservices/wallpaper/frameworks/kits/extension:wallpaperextension", - "//base/miscservices/wallpaper/frameworks/kits/extension:wallpaper_extension_module", - "//base/miscservices/wallpaper/interfaces/kits/napi/wallpaperextension:wallpaperextension_napi", - "//base/miscservices/wallpaper/interfaces/kits/napi/wallpaper_extension_context:wallpaperextensioncontext_napi", - "//base/miscservices/wallpaper/interfaces/kits/napi:wallpaper", - "//base/miscservices/wallpaper/utils:wallpaper_utils", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpaperdefault.jpeg", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpaperlockdefault.jpeg" + "//base/theme/wallpaper_mgr:wallpaper_mgr_packages", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", + "//base/theme/wallpaper_mgr/frameworks/kits/extension:wallpaperextension", + "//base/theme/wallpaper_mgr/frameworks/kits/extension:wallpaper_extension_module", + "//base/theme/wallpaper_mgr/interfaces/kits/napi/wallpaperextension:wallpaperextension_napi", + "//base/theme/wallpaper_mgr/interfaces/kits/napi/wallpaper_extension_context:wallpaperextensioncontext_napi", + "//base/theme/wallpaper_mgr/interfaces/kits/napi:wallpaper", + "//base/theme/wallpaper_mgr/utils:wallpaper_utils", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpaperdefault.jpeg", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpaperlockdefault.jpeg" ], "test": [ - "//base/miscservices/wallpaper/test:wallpaper_test", - "//base/miscservices/wallpaper/test/fuzztest:fuzztest" + "//base/theme/wallpaper_mgr/test:wallpaper_test", + "//base/theme/wallpaper_mgr/test/fuzztest:fuzztest" ] }, "hisysevent_config": [ - "//base/miscservices/wallpaper/hisysevent.yaml" + "//base/theme/wallpaper_mgr/hisysevent.yaml" ] } } diff --git a/etc/init/BUILD.gn b/etc/init/BUILD.gn index d2d946b..3ea514c 100644 --- a/etc/init/BUILD.gn +++ b/etc/init/BUILD.gn @@ -18,6 +18,6 @@ import("//build/ohos.gni") ohos_prebuilt_etc("wallpaperservice.rc") { source = "wallpaperservice.cfg" relative_install_dir = "init" - part_name = "wallpaper_native" - subsystem_name = "miscservices" + part_name = "wallpaper_mgr" + subsystem_name = "theme" } diff --git a/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn b/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn index 4e63900..77e04b1 100644 --- a/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn +++ b/frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn @@ -11,16 +11,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") import("//build/ohos.gni") config("wallpaper_manager_config") { visibility = [ ":*" ] include_dirs = [ "include", - "//base/miscservices/wallpaper/services/dfx/hisysevent_adapter", - "//base/miscservices/wallpaper/services/include", - "//base/miscservices/wallpaper/utils/include", + "//base/theme/wallpaper_mgr/services/dfx/hisysevent_adapter", + "//base/theme/wallpaper_mgr/services/include", + "//base/theme/wallpaper_mgr/utils/include", ] cflags_cc = [ "-fexceptions" ] } @@ -39,7 +39,7 @@ ohos_shared_library("wallpapermanager") { deps = [ "${utils_path}:wallpaper_utils", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", - "//base/miscservices/wallpaper/services:wallpaper_service", + "//base/theme/wallpaper_mgr/services:wallpaper_service", ] external_deps = [ "hisysevent_native:libhisysevent", @@ -50,17 +50,17 @@ ohos_shared_library("wallpapermanager") { "multimedia_image_standard:image_native", "samgr_standard:samgr_proxy", ] - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } ohos_prebuilt_etc("wallpaperdefault.jpeg") { source = "data/wallpaperdefault.jpeg" - part_name = "wallpaper_native" - subsystem_name = "miscservices" + part_name = "wallpaper_mgr" + subsystem_name = "theme" } ohos_prebuilt_etc("wallpaperlockdefault.jpeg") { source = "data/wallpaperlockdefault.jpeg" - part_name = "wallpaper_native" - subsystem_name = "miscservices" + part_name = "wallpaper_mgr" + subsystem_name = "theme" } diff --git a/frameworks/kits/extension/BUILD.gn b/frameworks/kits/extension/BUILD.gn index 79b1ff1..136576d 100644 --- a/frameworks/kits/extension/BUILD.gn +++ b/frameworks/kits/extension/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") import("//build/ohos.gni") ABILITY_RUNTIME_INNERKITS_PATH = "${ability_runtime_inner_api_path}" @@ -19,8 +19,8 @@ ABILITY_RUNTIME_INNERKITS_PATH = "${ability_runtime_inner_api_path}" config("ability_config") { visibility = [ ":*" ] include_dirs = [ - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/frameworks/kits/extension/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/include", "//utils/native/base/include", "${ability_runtime_path}/interfaces/kits/native/ability/native", "${ability_runtime_path}/interfaces/kits/native/appkit/app", @@ -61,8 +61,8 @@ config("ability_config") { config("ability_public_config") { visibility = [ ":*" ] include_dirs = [ - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/frameworks/kits/extension/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/include", "${ABILITY_RUNTIME_INNERKITS_PATH}/base/include", "${ability_runtime_path}/interfaces/kits/native", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app", @@ -87,8 +87,8 @@ config("ability_public_config") { ohos_shared_library("wallpaperextension") { include_dirs = [ - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/frameworks/kits/extension/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/include", "//foundation/distributeddatamgr/appdatamgr/relational_store/frameworks/js/napi/rdb/include", "//foundation/distributeddatamgr/appdatamgr/relational_store/frameworks/js/napi/common/include", "//foundation/distributeddatamgr/appdatamgr/relational_store/frameworks/js/napi/dataability/include", @@ -97,10 +97,10 @@ ohos_shared_library("wallpaperextension") { ] sources = [ - "//base/miscservices/wallpaper/frameworks/kits/extension/src/js_wallpaper_extension.cpp", - "//base/miscservices/wallpaper/frameworks/kits/extension/src/js_wallpaper_extension_context.cpp", - "//base/miscservices/wallpaper/frameworks/kits/extension/src/wallpaper_extension.cpp", - "//base/miscservices/wallpaper/frameworks/kits/extension/src/wallpaper_extension_context.cpp", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/src/js_wallpaper_extension.cpp", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/src/js_wallpaper_extension_context.cpp", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/src/wallpaper_extension.cpp", + "//base/theme/wallpaper_mgr/frameworks/kits/extension/src/wallpaper_extension_context.cpp", ] configs = [ ":ability_config" ] public_configs = [ @@ -110,7 +110,7 @@ ohos_shared_library("wallpaperextension") { deps = [ "${ability_runtime_path}/frameworks/native/appkit:app_context", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", ] external_deps = [ @@ -134,8 +134,8 @@ ohos_shared_library("wallpaperextension") { "//foundation/window/window_manager/wm:libwm", ] - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } ohos_shared_library("wallpaper_extension_module") { @@ -144,7 +144,7 @@ ohos_shared_library("wallpaper_extension_module") { "${ability_runtime_path}/interfaces/kits/native/ability/native/ability_runtime", ] - sources = [ "//base/miscservices/wallpaper/frameworks/kits/extension/src/wallpaper_extension_module_loader.cpp" ] + sources = [ "//base/theme/wallpaper_mgr/frameworks/kits/extension/src/wallpaper_extension_module_loader.cpp" ] configs = [ ":ability_config" ] public_configs = [ ":ability_public_config" ] @@ -167,6 +167,6 @@ ohos_shared_library("wallpaper_extension_module") { "hiviewdfx_hilog_native:libhilog", ] - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index 7b5d250..8edf83d 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") import("//build/ohos.gni") ohos_shared_library("wallpaper") { @@ -20,9 +20,9 @@ ohos_shared_library("wallpaper") { "//third_party/node/src", "${ability_runtime_services_path}/common/include", "//utils/system/safwk/native/include", - "//base/miscservices/wallpaper/interfaces/kits/napi", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/utils/include", + "//base/theme/wallpaper_mgr/interfaces/kits/napi", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/utils/include", "//third_party/libuv/include", "//utils/native/base/include", ] @@ -35,7 +35,7 @@ ohos_shared_library("wallpaper") { ] deps = [ "${utils_path}:wallpaper_utils", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", ] external_deps = [ @@ -47,6 +47,6 @@ ohos_shared_library("wallpaper") { ] relative_install_dir = "module" - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/interfaces/kits/napi/wallpaper_extension_context/BUILD.gn b/interfaces/kits/napi/wallpaper_extension_context/BUILD.gn index 048d5ff..e0618e7 100644 --- a/interfaces/kits/napi/wallpaper_extension_context/BUILD.gn +++ b/interfaces/kits/napi/wallpaper_extension_context/BUILD.gn @@ -45,6 +45,6 @@ ohos_shared_library("wallpaperextensioncontext_napi") { external_deps = [ "napi:ace_napi" ] relative_install_dir = "module" - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/interfaces/kits/napi/wallpaperextension/BUILD.gn b/interfaces/kits/napi/wallpaperextension/BUILD.gn index be4f8f3..a08fd54 100644 --- a/interfaces/kits/napi/wallpaperextension/BUILD.gn +++ b/interfaces/kits/napi/wallpaperextension/BUILD.gn @@ -45,6 +45,6 @@ ohos_shared_library("wallpaperextension_napi") { external_deps = [ "napi:ace_napi" ] relative_install_dir = "module" - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/profile/BUILD.gn b/profile/BUILD.gn index e1d7841..bd5a2cb 100644 --- a/profile/BUILD.gn +++ b/profile/BUILD.gn @@ -15,5 +15,5 @@ import("//build/ohos/sa_profile/sa_profile.gni") ohos_sa_profile("wallpaper_sa_profiles") { sources = [ "3705.xml" ] - part_name = "wallpaper_native" + part_name = "wallpaper_mgr" } diff --git a/services/BUILD.gn b/services/BUILD.gn index ae7d2d7..1602a5f 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") import("//build/ohos.gni") config("wallpaper_service_config") { @@ -45,8 +45,8 @@ ohos_shared_library("wallpaper_service") { ] include_dirs = [ "//third_party/json/include", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/utils/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/utils/include", "//base/security/access_token/interfaces/innerkits", "//foundation/window/window_manager/interfaces/innerkits/dm", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include", @@ -76,6 +76,6 @@ ohos_shared_library("wallpaper_service") { "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/test/BUILD.gn b/test/BUILD.gn index da1c11a..43bb853 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -9,13 +9,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") import("//build/test.gni") ## UnitTest wallpaper_test {{{ ohos_unittest("wallpaper_test") { - module_out_path = "wallpaper_native/wallpaper_test" + module_out_path = "wallpaper_mgr/wallpaper_test" sources = [ "unittest/wallpaper_test.cpp", #"unittest/wallpaperpermissontest.cpp", @@ -24,11 +24,11 @@ ohos_unittest("wallpaper_test") { include_dirs = [ "//third_party/json/include", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/utils/include", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/services/dfx/hidumper_adapter", - "//base/miscservices/wallpaper/services/dfx/hisysevent_adapter", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/utils/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/services/dfx/hidumper_adapter", + "//base/theme/wallpaper_mgr/services/dfx/hisysevent_adapter", "//foundation/graphic/graphic_2d/interfaces/innerkits/wm", #"//foundation/multimedia/image_standard/interfaces/innerkits/include", @@ -36,8 +36,8 @@ ohos_unittest("wallpaper_test") { deps = [ "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", - "//base/miscservices/wallpaper/services:wallpaper_service", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager:wallpapermanager", + "//base/theme/wallpaper_mgr/services:wallpaper_service", "//foundation/multimedia/image_standard:image_framework", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index 7e03997..e7ae2b3 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") group("fuzztest") { testonly = true diff --git a/test/fuzztest/wallpaperservice_fuzzer/BUILD.gn b/test/fuzztest/wallpaperservice_fuzzer/BUILD.gn index 9e365fd..ae9f3fa 100644 --- a/test/fuzztest/wallpaperservice_fuzzer/BUILD.gn +++ b/test/fuzztest/wallpaperservice_fuzzer/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/miscservices/wallpaper/wallpaper.gni") +import("//base/theme/wallpaper_mgr/wallpaper.gni") #####################hydra-fuzz################### import("//build/config/features.gni") @@ -20,16 +20,16 @@ import("//build/test.gni") ##############################fuzztest########################################## ohos_fuzztest("WallpaperServiceFuzzTest") { - module_out_path = "miscservices/wallpaper" + module_out_path = "theme/wallpaper" fuzz_config_file = - "//base/miscservices/wallpaper/test/fuzztest/wallpaperservice_fuzzer" + "//base/theme/wallpaper_mgr/test/fuzztest/wallpaperservice_fuzzer" include_dirs = [ - "//base/miscservices/wallpaper/services/include", + "//base/theme/wallpaper_mgr/services/include", "//base/security/access_token/interfaces/innerkits/accesstoken/include", - "//base/miscservices/wallpaper/frameworks/innerkitsimpl/wallpaper_manager/include", - "//base/miscservices/wallpaper/utils/include", + "//base/theme/wallpaper_mgr/frameworks/innerkitsimpl/wallpaper_manager/include", + "//base/theme/wallpaper_mgr/utils/include", "//foundation/window/window_manager/interfaces/innerkits/dm", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk", ] @@ -47,7 +47,7 @@ ohos_fuzztest("WallpaperServiceFuzzTest") { "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", "${ability_runtime_services_path}/abilitymgr:abilityms", "${utils_path}:wallpaper_utils", - "//base/miscservices/wallpaper/services:wallpaper_service", + "//base/theme/wallpaper_mgr/services:wallpaper_service", "//foundation/window/window_manager/utils:libwmutil", "//foundation/window/window_manager/wm:libwm", ] diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 77afe8c..bf9bd73 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -17,6 +17,6 @@ ohos_shared_library("wallpaper_utils") { include_dirs = [ "include" ] deps = [ "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - subsystem_name = "miscservices" - part_name = "wallpaper_native" + subsystem_name = "theme" + part_name = "wallpaper_mgr" } diff --git a/wallpaper.gni b/wallpaper.gni index 94895c7..6bf5e9c 100644 --- a/wallpaper.gni +++ b/wallpaper.gni @@ -21,7 +21,7 @@ ability_runtime_napi_path = "${ability_runtime_path}/frameworks/js/napi" ability_runtime_services_path = "${ability_runtime_path}/services" -wallpaper_path = "//base/miscservices/wallpaper" +wallpaper_path = "//base/theme/wallpaper_mgr" adapter_path = "${wallpaper_path}/adapter" utils_path = "${wallpaper_path}/utils"