From c0bbe2ef963d13bd8bdf4522c22ddd0b4a5d61fc Mon Sep 17 00:00:00 2001 From: ShiJie Date: Tue, 12 Jul 2022 19:36:24 +0800 Subject: [PATCH] build: Compile the decoupling Signed-off-by: ShiJie Change-Id: I599f6fac69fab10be9e5c238989fbce258ce247d --- bundle.json | 20 ++++++---- displaymgr.gni | 10 ++--- interfaces/innerkits/BUILD.gn | 11 +++--- interfaces/kits/js/napi/BUILD.gn | 11 ++---- sa_profile/BUILD.gn | 2 +- service/BUILD.gn | 38 +++++++++++++++---- service/etc/BUILD.gn | 2 +- test/unittest/common/display_fuzzer/BUILD.gn | 6 +-- test/unittest/common/napi/BUILD.gn | 2 +- test/unittest/common/native/BUILD.gn | 15 ++------ .../src/display_power_mgr_service_test.cpp | 2 +- 11 files changed, 66 insertions(+), 53 deletions(-) diff --git a/bundle.json b/bundle.json index 41d6dcd..0d7e4ea 100755 --- a/bundle.json +++ b/bundle.json @@ -50,13 +50,19 @@ ] }, "build": { - "sub_component": [ - "//base/powermgr/display_manager/interfaces/innerkits:displaymgr", - "//base/powermgr/display_manager/sa_profile:displaymgr_sa_profile", - "//base/powermgr/display_manager/service:displaymgrservice", - "//base/powermgr/display_manager/service/etc:display.para", - "//base/powermgr/display_manager/interfaces/kits/js/napi:brightness" - ], + "group_type": { + "base_group": [], + "fwk_group": [ + "//base/powermgr/display_manager/interfaces/kits/js/napi:brightness", + "//base/powermgr/display_manager/interfaces/innerkits:displaymgr" + ], + "service_group": [ + "//base/powermgr/display_manager/sa_profile:displaymgr_sa_profile", + "//base/powermgr/display_manager/service:displaymgrservice", + "//base/powermgr/display_manager/service:displaymgr_stub", + "//base/powermgr/display_manager/service/etc:display.para" + ] + }, "inner_kits": [ { "name": "//base/powermgr/display_manager/interfaces/innerkits:displaymgr", diff --git a/displaymgr.gni b/displaymgr.gni index d40f698..6979129 100644 --- a/displaymgr.gni +++ b/displaymgr.gni @@ -13,18 +13,16 @@ import("//build/ohos.gni") -displaymgr_native_part_name = "display_manager" +displaymgr_part_name = "display_manager" displaymgr_root_path = "//base/powermgr/display_manager" displaymgr_framework_path = "${displaymgr_root_path}/frameworks" -displaymgr_service_path = "${displaymgr_root_path}/service" +displaymgr_service_zidl = "${displaymgr_root_path}/service/zidl" -displaymgr_interfaces_path = "${displaymgr_root_path}/interfaces" +displaymgr_innerkits = "${displaymgr_root_path}/interfaces/innerkits" -displaymgr_native_innerkits_path = "${displaymgr_interfaces_path}/innerkits" - -displaymgr_kits_path = "${displaymgr_interfaces_path}/kits" +displaymgr_kits = "${displaymgr_root_path}/interfaces/kits" displaymgr_utils_path = "${displaymgr_root_path}/utils" diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 18f9bbf..fa516f2 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -15,10 +15,8 @@ import("//base/powermgr/display_manager/displaymgr.gni") config("displaymgr_private_config") { include_dirs = [ - "${displaymgr_service_path}/zidl/include", + "${displaymgr_service_zidl}/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", - "//base/powermgr/power_manager/interfaces/innerkits/native/include", - "//utils/system/safwk/native/include", ] } @@ -29,8 +27,8 @@ config("displaymgr_public_config") { ohos_shared_library("displaymgr") { sources = [ "${displaymgr_framework_path}/native/display_power_mgr_client.cpp", - "${displaymgr_service_path}/zidl/src/display_power_callback_stub.cpp", - "${displaymgr_service_path}/zidl/src/display_power_mgr_proxy.cpp", + "${displaymgr_service_zidl}/src/display_power_callback_stub.cpp", + "${displaymgr_service_zidl}/src/display_power_mgr_proxy.cpp", ] configs = [ @@ -45,9 +43,10 @@ ohos_shared_library("displaymgr") { "hicollie_native:libhicollie", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] - part_name = "${displaymgr_native_part_name}" + part_name = "${displaymgr_part_name}" } diff --git a/interfaces/kits/js/napi/BUILD.gn b/interfaces/kits/js/napi/BUILD.gn index 955e2bb..ebfd156 100644 --- a/interfaces/kits/js/napi/BUILD.gn +++ b/interfaces/kits/js/napi/BUILD.gn @@ -19,23 +19,18 @@ ohos_shared_library("brightness") { "${displaymgr_framework_path}/napi/brightness_module.cpp", ] - include_dirs = - [ "//base/powermgr/power_manager/interfaces/innerkits/native/include" ] - configs = [ "${displaymgr_utils_path}:utils_config" ] - deps = [ - "${displaymgr_native_innerkits_path}:displaymgr", - "//foundation/arkui/napi:ace_napi", - ] + deps = [ "${displaymgr_innerkits}:displaymgr" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "napi:ace_napi", "power_manager:powermgr_client", ] relative_install_dir = "module" - part_name = "${displaymgr_native_part_name}" + part_name = "${displaymgr_part_name}" } diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 50b94f4..e921448 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -16,5 +16,5 @@ import("//build/ohos/sa_profile/sa_profile.gni") ohos_sa_profile("displaymgr_sa_profile") { sources = [ "3308.xml" ] - part_name = "${displaymgr_native_part_name}" + part_name = "${displaymgr_part_name}" } diff --git a/service/BUILD.gn b/service/BUILD.gn index bc9a6d4..7b252ef 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -15,11 +15,7 @@ import("//base/powermgr/display_manager/displaymgr.gni") config("displaymgr_private_config") { include_dirs = [ - "//utils/system/safwk/native/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", - "//base/powermgr/power_manager/interfaces/innerkits/native/include", - "//base/sensors/sensor/interfaces/native/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", ] } @@ -51,16 +47,16 @@ ohos_shared_library("displaymgrservice") { public_configs = [ ":displaymgr_public_config" ] deps = [ - "${displaymgr_native_innerkits_path}:displaymgr", - "//foundation/graphic/graphic_2d:libsurface", + ":displaymgr_stub", + "${displaymgr_innerkits}:displaymgr", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - "//foundation/window/window_manager/utils:libwmutil", ] external_deps = [ "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", + "graphic_standard:surface", "hicollie_native:libhicollie", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", @@ -73,5 +69,31 @@ ohos_shared_library("displaymgrservice") { "window_manager:libdm", ] - part_name = "${displaymgr_native_part_name}" + part_name = "${displaymgr_part_name}" +} + +ohos_shared_library("displaymgr_stub") { + sources = [ "zidl/src/display_power_mgr_stub.cpp" ] + + configs = [ + "${displaymgr_utils_path}:utils_config", + ":displaymgr_private_config", + ] + + public_configs = [ ":displaymgr_public_config" ] + + deps = [ + "${displaymgr_innerkits}:displaymgr", + "//utils/native/base:utils", + ] + + external_deps = [ + "hicollie_native:libhicollie", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", + ] + + part_name = "${displaymgr_part_name}" } diff --git a/service/etc/BUILD.gn b/service/etc/BUILD.gn index 59e9863..d7b6016 100644 --- a/service/etc/BUILD.gn +++ b/service/etc/BUILD.gn @@ -18,6 +18,6 @@ import("//build/ohos.gni") ohos_prebuilt_etc("display.para") { source = "display.para" relative_install_dir = "param" - part_name = "${displaymgr_native_part_name}" + part_name = "${displaymgr_part_name}" subsystem_name = "powermgr" } diff --git a/test/unittest/common/display_fuzzer/BUILD.gn b/test/unittest/common/display_fuzzer/BUILD.gn index b70c21f..e4c4750 100644 --- a/test/unittest/common/display_fuzzer/BUILD.gn +++ b/test/unittest/common/display_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//base/powermgr/display_manager/displaymgr.gni") import("//build/test.gni") -module_output_path = "${displaymgr_native_part_name}/displaymgr_native" +module_output_path = "${displaymgr_part_name}/displaymgr" ##############################fuzztest########################################## ohos_fuzztest("DisplayFuzzTest") { @@ -25,7 +25,6 @@ ohos_fuzztest("DisplayFuzzTest") { include_dirs = [ "./", "${displaymgr_utils_path}:utils_config", - "//base/powermgr/power_manager/interfaces/innerkits/native/include", ] cflags = [ "-g", @@ -34,11 +33,12 @@ ohos_fuzztest("DisplayFuzzTest") { "-fno-omit-frame-pointer", ] sources = [ "./display_fuzzer.cpp" ] - deps = [ "${displaymgr_native_innerkits_path}:displaymgr" ] + deps = [ "${displaymgr_innerkits}:displaymgr" ] external_deps = [ "c_utils:utils", "ipc:ipc_core", + "power_manager:powermgr_client", ] } diff --git a/test/unittest/common/napi/BUILD.gn b/test/unittest/common/napi/BUILD.gn index e0250f7..db3c80d 100644 --- a/test/unittest/common/napi/BUILD.gn +++ b/test/unittest/common/napi/BUILD.gn @@ -14,7 +14,7 @@ import("//base/powermgr/display_manager/displaymgr.gni") import("//build/test.gni") -module_output_path = "${displaymgr_native_part_name}/displaymgr_native" +module_output_path = "${displaymgr_part_name}/displaymgr" ohos_js_unittest("PowerMgrDisplayJsTest") { module_out_path = module_output_path diff --git a/test/unittest/common/native/BUILD.gn b/test/unittest/common/native/BUILD.gn index 0c5df0f..3f0cf07 100644 --- a/test/unittest/common/native/BUILD.gn +++ b/test/unittest/common/native/BUILD.gn @@ -14,18 +14,13 @@ import("//base/powermgr/display_manager/displaymgr.gni") import("//build/test.gni") -module_output_path = "${displaymgr_native_part_name}/displaymgr_native" +module_output_path = "${displaymgr_part_name}/displaymgr" ############################################################################### config("module_private_config") { visibility = [ ":*" ] - include_dirs = [ - "include", - "//base/powermgr/power_manager/interfaces/innerkits/native/include", - "//base/sensors/sensor/interfaces/native/include", - "//utils/system/safwk/native/include", - ] + include_dirs = [ "include" ] } ##############################unittest########################################## @@ -43,18 +38,16 @@ ohos_unittest("unittest_display_mgr_service") { ] deps = [ - "${displaymgr_native_innerkits_path}:displaymgr", - "${displaymgr_service_path}:displaymgrservice", + "${displaymgr_innerkits}:displaymgr", "//third_party/googletest:gtest_main", ] external_deps = [ "c_utils:utils", - "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "sensor:sensor_interface_native", ] } diff --git a/test/unittest/common/native/src/display_power_mgr_service_test.cpp b/test/unittest/common/native/src/display_power_mgr_service_test.cpp index 0f3455c..61ed413 100644 --- a/test/unittest/common/native/src/display_power_mgr_service_test.cpp +++ b/test/unittest/common/native/src/display_power_mgr_service_test.cpp @@ -20,7 +20,7 @@ #include #include "display_power_mgr_client.h" -#include "display_power_mgr_service.h" +#include "display_log.h" using namespace testing::ext; using namespace OHOS; -- Gitee