diff --git a/brightness_manager/BUILD.gn b/brightness_manager/BUILD.gn
index 9f071eb44d55f890b02a10604412918fcb70aedc..54726b1f3842a7d5365427168c26f158f231bd0b 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,6 @@ ohos_static_library("brightness_manager") {
     "samgr:samgr_proxy",
   ]
 
-  defines = []
   if (use_libfuzzer) {
     defines += [ "FUZZ_TEST" ]
   }
@@ -87,7 +85,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 a70d58cd2efd332c22a0ca589eba87e6148ca43e..59b4de5f7b571f406dab5094b88b99e91bf42cc1 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 <hisysevent.h>
+#endif
 #include <ipc_skeleton.h>
 
 #include "display_log.h"
diff --git a/brightness_manager/src/brightness_service.cpp b/brightness_manager/src/brightness_service.cpp
index b678263e6adf37c0e58f0355e38c676d29706832..5c8abbf6665260bac6bcbf8d3ecc3af94f5a4aea 100644
--- a/brightness_manager/src/brightness_service.cpp
+++ b/brightness_manager/src/brightness_service.cpp
@@ -16,7 +16,9 @@
 #include "brightness_service.h"
 
 #include <file_ex.h>
+#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART
 #include <hisysevent.h>
+#endif
 #include <ipc_skeleton.h>
 #include <securec.h>
 
diff --git a/brightness_manager/test/unittest/BUILD.gn b/brightness_manager/test/unittest/BUILD.gn
index 99cc900b07ad8b823b9c9a3ff8e76b53ae615976..c4d17caad25361d1baa779d639eb7126da7d5102 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",
   ]
 
-  defines = []
   if (window_manager_use_sceneboard) {
     defines += [ "SCENE_BOARD_ENABLED" ]
     external_deps += [ "window_manager:libdm_lite" ]
@@ -74,7 +73,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/displaymgr.gni b/displaymgr.gni
index 41cf8b305c61bbc290226c413bcf8acd43ab1bd0..8815dfef0d88cedf4561d2205e7f124f043ab035 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 c64ff2c8e729dac267bb5cbc6c0c10fb2ca06555..3b809894bf60db1059763787a1e54710dffce149 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,6 @@ 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 +88,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 92dbb29046cc9eb92d2edbb98b3ee971b49cf2b5..db3cf22b5bb66dff1d100792defb4ac01d3b1965 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 <hisysevent.h>
+#endif
 #include <file_ex.h>
 #include <securec.h>
 #include <system_ability_definition.h>
@@ -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 739d06cba3c3a9cd8d90c8e98bde17d89989ff90..c225df805c87a3a2557c00fb512c8169c194a4ff 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 <hisysevent.h>
+#endif
 #include <ipc_skeleton.h>
 
 #include "display_log.h"
@@ -143,8 +144,10 @@ bool ScreenAction::SetDisplayState(DisplayState state, const std::function<void(
     });
     IPCSkeleton::SetCallingIdentity(identity);
     // Notify screen state change event to battery statistics
+#ifdef HAS_HIVIEWDFX_HISYSEVENT_PART
     HiSysEventWrite(HiviewDFX::HiSysEvent::Domain::DISPLAY, "SCREEN_STATE",
         HiviewDFX::HiSysEvent::EventType::STATISTIC, "STATE", static_cast<int32_t>(state));
+#endif
     DISPLAY_HILOGI(FEAT_STATE, "[UL_POWER] SetDisplayState: displayId=%{public}u, state=%{public}u, ret=%{public}d",
         displayId_, static_cast<uint32_t>(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 e0c123a5a05a6701b816197474b7d883186433b0..f3251093148531c14f340decfea008a96067e403 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,6 @@ 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 +87,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 87a0d2bf1888efaebc439762a2921821ec18d6d8..329e64653761f9d263ec71c994e391bb29321a53 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,6 @@ 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 +87,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 d87d8cf39dc6953ee5aee35987c1d93836f76213..220233a7eb80b23815cd6fe2c75b94718a30729f 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,6 @@ 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 +87,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 96f37c03cab021f3035ca197c693d661af2f7930..d8522aeb8024f01793d035ecc955f81b7eeba58b 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,6 @@ 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 +87,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 57b95a1fe6ea4bbac4c1b6ed984e859fe917e0e2..1f81ef1acade96fe1ba2dc7d7f4492e3d7bb362c 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,6 @@ 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 +86,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 604b2f9a7e50732be504e67480a4dc95e8ebfcfa..8016246b7a66465712fcfd94051de649703d2c9c 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,6 @@ 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 +87,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 95acc33832a17c54b6af994eed046514551a3882..1027891b057e9a8fe9c4caf781e8cbe2c304aaa6 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,6 @@ 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 +86,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 0d893df536fb1689e48b39824996ec8ca05e9b78..fb202e4b4c3b0f686512bb2c37740031e97e866e 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,6 @@ 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 +87,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 e56b81de353c8678bbf5434a5d41bab660b54623..4d0965fd9c89c37c079fdfdc76a9eeb5bf7d5a8a 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,6 @@ 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 +87,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 078ac6ab2a1a3cd1f4693a4cc724b8f8bed77fba..68733bce7e4aef4db4013472f6cdd3c445dd2c96 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,6 @@ 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 +87,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 392c6f01dbb5b6aab07188deb8c85a124df2ab69..9bedb48bda67891ca4a9df9dcd16ae53cb914c28 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,6 @@ 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 +87,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 8e5c19c4a6f4874bf8ea1f004153582fb928aa8d..713b5d7bff3021847d7e0f16af6fc94359cc1518 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,6 @@ 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 +87,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 12baaf3d91df187147e0258fe503a5319ae437ad..4ee5381071431622a18e967cff2ad72b46d1fdf5 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 033a0ee7f15326b9c4325649ace7b0e858e0af77..abf7bbf3d37e2203108987a3b6032ad368c5e7bb 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,6 @@ 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 +87,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/BUILD.gn b/state_manager/test/unittest/BUILD.gn
index 61142e68801f935661192fcffd32777c8b90c780..b5c740d2fec1cc40a8b79e7cedeff6fbcce01d72 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",
   ]
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 757d141114e14eeb562022405ad98e72a0497f61..5fc6a9c9539c0cca9393d1226188b9fd1cdf8840 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 <hisysevent.h>
+#endif
 #include <memory>
 #include <unistd.h>
 
 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 624608ec21e30ea451832aa61c82429de58e5dd0..723d83059e716517290eb0cae1a39bbca70a00d9 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 <hisysevent.h>
+#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;