From 139d4876854f0765c62157d197e88ee42a0fe680 Mon Sep 17 00:00:00 2001 From: lulu1023 Date: Mon, 2 Sep 2024 16:18:41 +0800 Subject: [PATCH 1/5] build: decouple hisysevent1 Signed-off-by: lulu1023 --- brightness_manager/BUILD.gn | 7 ++++--- brightness_manager/src/brightness_action.cpp | 3 ++- brightness_manager/src/brightness_service.cpp | 2 ++ displaymgr.gni | 9 +++++++++ state_manager/service/BUILD.gn | 6 ++++-- .../service/native/src/display_power_mgr_service.cpp | 5 ++++- state_manager/service/native/src/screen_action.cpp | 5 ++++- .../test/fuzztest/adjustbrightness_fuzzer/BUILD.gn | 6 ++++-- .../test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/boostbrightness_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/discountbrightness_fuzzer/BUILD.gn | 7 +++++-- state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/getbrightness_fuzzer/BUILD.gn | 7 +++++-- state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/overridebrightness_fuzzer/BUILD.gn | 7 +++++-- .../fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/registercallback_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/setbrightness_fuzzer/BUILD.gn | 7 +++++-- .../test/fuzztest/setcoordinated_fuzzer/BUILD.gn | 7 +++++-- .../fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn | 6 ++++-- .../test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn | 7 +++++-- .../test/unittest/src/mock/display_mock_parcel_test.cpp | 4 ++++ .../test/unittest/src/mock/display_mock_test.cpp | 4 ++++ 23 files changed, 105 insertions(+), 36 deletions(-) diff --git a/brightness_manager/BUILD.gn b/brightness_manager/BUILD.gn index 9f071eb..6fa99ad 100644 --- a/brightness_manager/BUILD.gn +++ b/brightness_manager/BUILD.gn @@ -57,7 +57,6 @@ ohos_static_library("brightness_manager") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "jsoncpp:jsoncpp", @@ -68,7 +67,7 @@ ohos_static_library("brightness_manager") { "samgr:samgr_proxy", ] - defines = [] + if (use_libfuzzer) { defines += [ "FUZZ_TEST" ] } @@ -87,7 +86,9 @@ ohos_static_library("brightness_manager") { if (display_manager_feature_brightnessext != "") { defines += [ "OHOS_BUILD_ENABLE_BRIGHTNESS_WRAPPER" ] } - + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } subsystem_name = "powermgr" part_name = "${displaymgr_part_name}" } diff --git a/brightness_manager/src/brightness_action.cpp b/brightness_manager/src/brightness_action.cpp index a70d58c..59b4de5 100644 --- a/brightness_manager/src/brightness_action.cpp +++ b/brightness_manager/src/brightness_action.cpp @@ -14,8 +14,9 @@ */ #include "brightness_action.h" - +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif #include #include "display_log.h" diff --git a/brightness_manager/src/brightness_service.cpp b/brightness_manager/src/brightness_service.cpp index b678263..5c8abbf 100644 --- a/brightness_manager/src/brightness_service.cpp +++ b/brightness_manager/src/brightness_service.cpp @@ -16,7 +16,9 @@ #include "brightness_service.h" #include +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif #include #include diff --git a/displaymgr.gni b/displaymgr.gni index 41cf8b3..8815dfe 100644 --- a/displaymgr.gni +++ b/displaymgr.gni @@ -14,6 +14,7 @@ import("//build/ohos.gni") declare_args() { + defines = [] has_sensors_sensor_part = true if (!defined(global_parts_info) || defined(global_parts_info.sensors_sensor)) { @@ -22,6 +23,14 @@ declare_args() { has_sensors_sensor_part = false } display_manager_feature_brightnessext = "" + + if (!defined(global_parts_info) || + defined(global_parts_info.hiviewdfx_hisysevent)) { + has_hiviewdfx_hisysevent_part = true + defines += [ "HAS_HIVIEWDFX_HISYSEVENT_PART" ] + } else { + has_hiviewdfx_hisysevent_part = false + } } displaymgr_part_name = "display_manager" diff --git a/state_manager/service/BUILD.gn b/state_manager/service/BUILD.gn index c64ff2c..b8e1f20 100644 --- a/state_manager/service/BUILD.gn +++ b/state_manager/service/BUILD.gn @@ -67,7 +67,6 @@ ohos_shared_library("displaymgrservice") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_shared_library("displaymgrservice") { "samgr:samgr_proxy", ] - defines = [] + if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] @@ -90,6 +89,9 @@ ohos_shared_library("displaymgrservice") { } else { external_deps += [ "window_manager:libdm" ] } + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } shlib_type = "sa" subsystem_name = "powermgr" diff --git a/state_manager/service/native/src/display_power_mgr_service.cpp b/state_manager/service/native/src/display_power_mgr_service.cpp index 92dbb29..db3cf22 100644 --- a/state_manager/service/native/src/display_power_mgr_service.cpp +++ b/state_manager/service/native/src/display_power_mgr_service.cpp @@ -14,8 +14,9 @@ */ #include "display_power_mgr_service.h" - +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif #include #include #include @@ -327,8 +328,10 @@ bool DisplayPowerMgrService::DiscountBrightness(double discount, uint32_t displa auto safeDiscount = GetSafeDiscount(discount, brightness); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "DiscountBrightness displayId=%{public}u, discount-%{public}lf", displayId, safeDiscount); +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::DISPLAY, "BACKLIGHT_DISCOUNT", HiviewDFX::HiSysEvent::EventType::STATISTIC, "RATIO", safeDiscount); +#endif return iter->second->DiscountBrightness(safeDiscount); } diff --git a/state_manager/service/native/src/screen_action.cpp b/state_manager/service/native/src/screen_action.cpp index 739d06c..c225df8 100644 --- a/state_manager/service/native/src/screen_action.cpp +++ b/state_manager/service/native/src/screen_action.cpp @@ -14,8 +14,9 @@ */ #include "screen_action.h" - +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif #include #include "display_log.h" @@ -143,8 +144,10 @@ bool ScreenAction::SetDisplayState(DisplayState state, const std::function(state)); +#endif DISPLAY_HILOGI(FEAT_STATE, "[UL_POWER] SetDisplayState: displayId=%{public}u, state=%{public}u, ret=%{public}d", displayId_, static_cast(state), ret); return ret; diff --git a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn index e0c123a..c898be7 100644 --- a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,7 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn index 87a0d2b..84b2745 100644 --- a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn index d87d8cf..14b6834 100644 --- a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn index 96f37c0..919f941 100644 --- a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn index 57b95a1..1fea73e 100644 --- a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn @@ -67,7 +67,6 @@ ohos_fuzztest("DisplayStateFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -77,7 +76,7 @@ ohos_fuzztest("DisplayStateFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -88,4 +87,8 @@ ohos_fuzztest("DisplayStateFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn index 604b2f9..65ceff5 100644 --- a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("GetBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn index 95acc33..ce6613c 100644 --- a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn @@ -67,7 +67,6 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -77,7 +76,7 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -88,4 +87,8 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn index 0d893df..33feb50 100644 --- a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn index e56b81d..c055e4c 100644 --- a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn index 078ac6a..dc0d455 100644 --- a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn index 392c6f0..13223bb 100644 --- a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("SetBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn index 8e5c19c..f475512 100644 --- a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn index 12baaf3..4ee5381 100644 --- a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,6 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +87,8 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn index 033a0ee..6b94576 100644 --- a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn @@ -68,7 +68,6 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "ffrt:libffrt", "hicollie:libhicollie", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "ipc:ipc_core", "power_manager:power_ffrt", @@ -78,7 +77,7 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -89,4 +88,8 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } + + if (has_hiviewdfx_hisysevent_part) { + external_deps += [ "hisysevent:libhisysevent" ] + } } diff --git a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp index 757d141..5fc6a9c 100644 --- a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp +++ b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp @@ -19,12 +19,16 @@ #include "display_power_mgr_client.h" #include "ipc_object_stub.h" #include "power_state_machine_info.h" +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif #include #include using namespace testing::ext; +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART using namespace OHOS::HiviewDFX; +#endif using namespace OHOS::PowerMgr; using namespace OHOS::DisplayPowerMgr; using namespace OHOS; diff --git a/state_manager/test/unittest/src/mock/display_mock_test.cpp b/state_manager/test/unittest/src/mock/display_mock_test.cpp index 624608e..723d830 100644 --- a/state_manager/test/unittest/src/mock/display_mock_test.cpp +++ b/state_manager/test/unittest/src/mock/display_mock_test.cpp @@ -22,10 +22,14 @@ #include "ipc_object_stub.h" #include "mock_display_remote_object.h" #include "power_state_machine_info.h" +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART #include +#endif using namespace testing::ext; +#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART using namespace OHOS::HiviewDFX; +#endif using namespace OHOS::PowerMgr; using namespace OHOS::DisplayPowerMgr; using namespace OHOS; -- Gitee From c0fe54a2bbf18d99e256d5b08e786f0cab92c221 Mon Sep 17 00:00:00 2001 From: lulu1023 Date: Mon, 2 Sep 2024 18:16:51 +0800 Subject: [PATCH 2/5] build: handle fn format Signed-off-by: lulu1023 --- brightness_manager/BUILD.gn | 1 - state_manager/service/BUILD.gn | 1 - 2 files changed, 2 deletions(-) diff --git a/brightness_manager/BUILD.gn b/brightness_manager/BUILD.gn index 6fa99ad..54726b1 100644 --- a/brightness_manager/BUILD.gn +++ b/brightness_manager/BUILD.gn @@ -67,7 +67,6 @@ ohos_static_library("brightness_manager") { "samgr:samgr_proxy", ] - if (use_libfuzzer) { defines += [ "FUZZ_TEST" ] } diff --git a/state_manager/service/BUILD.gn b/state_manager/service/BUILD.gn index b8e1f20..3b80989 100644 --- a/state_manager/service/BUILD.gn +++ b/state_manager/service/BUILD.gn @@ -77,7 +77,6 @@ ohos_shared_library("displaymgrservice") { "samgr:samgr_proxy", ] - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] -- Gitee From 6b2d60eabf87eef3d683ce4fdf3244a61e1fc1e5 Mon Sep 17 00:00:00 2001 From: lulu1023 Date: Mon, 2 Sep 2024 18:35:54 +0800 Subject: [PATCH 3/5] build: handle gn format2 Signed-off-by: lulu1023 --- state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn | 1 - .../test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn | 1 - state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn | 1 - 13 files changed, 13 deletions(-) diff --git a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn index c898be7..f325109 100644 --- a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn index 84b2745..329e646 100644 --- a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn index 14b6834..220233a 100644 --- a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn index 919f941..d8522ae 100644 --- a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn index 1fea73e..1f81ef1 100644 --- a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn @@ -76,7 +76,6 @@ ohos_fuzztest("DisplayStateFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn index 65ceff5..8016246 100644 --- a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn index ce6613c..1027891 100644 --- a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn @@ -76,7 +76,6 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn index 33feb50..fb202e4 100644 --- a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn index c055e4c..4d0965f 100644 --- a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn index dc0d455..68733bc 100644 --- a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn index 13223bb..9bedb48 100644 --- a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn index f475512..713b5d7 100644 --- a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] diff --git a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn index 6b94576..abf7bbf 100644 --- a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn @@ -77,7 +77,6 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "safwk:system_ability_fwk", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] -- Gitee From 56a1d3a9d015a2b473bd162273acd4e34b3f9c7c Mon Sep 17 00:00:00 2001 From: lulu1023 Date: Mon, 2 Sep 2024 18:53:58 +0800 Subject: [PATCH 4/5] build: handle gn format2 Signed-off-by: lulu1023 --- brightness_manager/test/unittest/BUILD.gn | 4 ++-- state_manager/test/unittest/BUILD.gn | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/brightness_manager/test/unittest/BUILD.gn b/brightness_manager/test/unittest/BUILD.gn index 99cc900..1f0333d 100644 --- a/brightness_manager/test/unittest/BUILD.gn +++ b/brightness_manager/test/unittest/BUILD.gn @@ -56,7 +56,7 @@ set_defaults("ohos_unittest") { "samgr:samgr_proxy", ] - defines = [] + if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] @@ -74,7 +74,7 @@ ohos_unittest("brightness_manager_ext_test") { include_dirs = [ "./include/" ] - defines = [ "BRIGHTNESS_DT_ENABLE" ] + defines += [ "BRIGHTNESS_DT_ENABLE" ] } ohos_unittest("brightness_manager_test") { diff --git a/state_manager/test/unittest/BUILD.gn b/state_manager/test/unittest/BUILD.gn index 61142e6..b5c740d 100644 --- a/state_manager/test/unittest/BUILD.gn +++ b/state_manager/test/unittest/BUILD.gn @@ -88,7 +88,7 @@ ohos_unittest("display_service_death_test") { "${displaymgr_utils_path}:coverage_flags", ] - defines = [ "DISPLAY_SERVICE_DEATH_UT" ] + defines += [ "DISPLAY_SERVICE_DEATH_UT" ] deps = [ "${displaymgr_inner_api}:displaymgr", @@ -139,7 +139,7 @@ ohos_unittest("display_mock_test") { "${displaymgr_utils_path}:coverage_flags", ] - defines = [ + defines += [ "MOCK_READSTRING_DESCRIPTIR", "MOCK_WRITE_INTERFACE_TOKEN_RETURN_TRUE", ] -- Gitee From bd69e123882e1bcca941efec3ef8201ad8cad831 Mon Sep 17 00:00:00 2001 From: lulu1023 Date: Mon, 2 Sep 2024 19:07:28 +0800 Subject: [PATCH 5/5] build: handle gn format3 Signed-off-by: lulu1023 --- brightness_manager/test/unittest/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/brightness_manager/test/unittest/BUILD.gn b/brightness_manager/test/unittest/BUILD.gn index 1f0333d..c4d17ca 100644 --- a/brightness_manager/test/unittest/BUILD.gn +++ b/brightness_manager/test/unittest/BUILD.gn @@ -56,7 +56,6 @@ set_defaults("ohos_unittest") { "samgr:samgr_proxy", ] - if (window_manager_use_sceneboard) { defines += [ "SCENE_BOARD_ENABLED" ] external_deps += [ "window_manager:libdm_lite" ] -- Gitee