openharmony/miscservices_wallpaper
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_wallpaper.git synced 2026-07-01 06:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

!121 Gitee Review - change_misc_components

Browse Source 
Merge pull request !121 from 鲍亚永/change_misc_components
This commit is contained in:
openharmony_ci
2022-07-22 06:18:37 +00:00
committed by Gitee
parent 2250e24b0a b794f0a58b
commit 6c35c18831
15 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
+1 -1
View File
@@ -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",
bundle.json
+17 -17
View File
@@ -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"
]
}
}
etc/init/BUILD.gn
+2 -2
View File
@@ -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"
}
frameworks/innerkitsimpl/wallpaper_manager/BUILD.gn
+11 -11
View File
@@ -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"
}
frameworks/kits/extension/BUILD.gn
+17 -17
View File
@@ -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"
}
interfaces/kits/napi/BUILD.gn
+7 -7
View File
@@ -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"
}
interfaces/kits/napi/wallpaper_extension_context/BUILD.gn
+2 -2
View File
@@ -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"
}
interfaces/kits/napi/wallpaperextension/BUILD.gn
+2 -2
View File
@@ -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"
}
profile/BUILD.gn
+1 -1
View File
@@ -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"
}
services/BUILD.gn
+5 -5
View File
@@ -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"
}
test/BUILD.gn
+9 -9
View File
@@ -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",
test/fuzztest/BUILD.gn
+1 -1
View File
@@ -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
test/fuzztest/wallpaperservice_fuzzer/BUILD.gn
+7 -7
View File
@@ -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",
]
utils/BUILD.gn
+2 -2
View File
@@ -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"
}
wallpaper.gni
+1 -1
View File
@@ -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"