!229 部件依赖整改、启动编译选项FS选项回合5.0.1-release

Merge pull request !229 from 李天刚/OpenHarmony-5.0.1-Release

dfx_utils/BUILD.gn

@@ -45,6 +45,12 @@ ohos_shared_library("libdinput_dfx_utils") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [ "${utils_path}:libdinput_utils" ]
 
   external_deps = [
@@ -58,7 +64,12 @@ ohos_shared_library("libdinput_dfx_utils") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

inputdevicehandler/BUILD.gn

@@ -45,6 +45,12 @@ ohos_shared_library("libdinput_handler") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${services_state_path}:libdinput_sink_state",
     "${utils_path}:libdinput_utils",
@@ -66,7 +72,12 @@ ohos_shared_library("libdinput_handler") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

interfaces/inner_kits/BUILD.gn

@@ -95,6 +95,12 @@ ohos_shared_library("libdinput_sdk") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
@@ -109,7 +115,12 @@ ohos_shared_library("libdinput_sdk") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn

@@ -30,8 +30,6 @@ ohos_unittest("add_white_list_infos_callbackl_test") {
   include_dirs = [
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${innerkits_path}/include",
     "${innerkits_path}/src",
     "${ipc_path}/include",

interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn

@@ -30,8 +30,6 @@ ohos_unittest("del_white_list_infos_callbackl_test") {
   include_dirs = [
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${innerkits_path}/include",
     "${innerkits_path}/src",
     "${ipc_path}/include",

interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn

@@ -30,8 +30,6 @@ ohos_unittest("dinput_source_callback_test") {
   include_dirs = [
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${innerkits_path}/include",
     "${innerkits_path}/src",
     "${ipc_path}/include",

interfaces/ipc/test/fuzztest/distributedinputstub_fuzzer/BUILD.gn

@@ -23,7 +23,6 @@ ohos_fuzztest("DistributedInputStubFuzzTest") {
   fuzz_config_file = "${ipc_path}/test/fuzztest/distributedinputstub_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${innerkits_path}/include",
     "${innerkits_path}/ipc/include",
     "${innerkits_path}/src",
@@ -39,8 +38,6 @@ ohos_fuzztest("DistributedInputStubFuzzTest") {
     "${services_source_path}/transport/include",
     "${dfx_utils_path}/include",
     "${utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${common_path}/test/mock",
     "${distributedinput_path}/services/transportbase/include",
     "${distributedinput_path}/utils/include",
@@ -110,6 +107,7 @@ ohos_fuzztest("DistributedInputStubFuzzTest") {
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",

interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn

@@ -30,8 +30,6 @@ ohos_unittest("unprepare_d_input_call_back_test") {
   include_dirs = [
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${innerkits_path}/include",
     "${innerkits_path}/src",
     "${ipc_path}/include",

interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn

@@ -30,8 +30,6 @@ ohos_unittest("unregister_d_input_call_back_test") {
   include_dirs = [
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${innerkits_path}/include",
     "${innerkits_path}/src",
     "${ipc_path}/include",

services/sink/inputcollector/BUILD.gn

@@ -44,6 +44,12 @@ ohos_shared_library("libdinput_collector") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${services_state_path}:libdinput_sink_state",
     "${utils_path}:libdinput_utils",
@@ -65,7 +71,12 @@ ohos_shared_library("libdinput_collector") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/sink/sinkmanager/BUILD.gn

@@ -55,6 +55,12 @@ ohos_shared_library("libdinput_sink") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${distributedinput_path}/services/state:libdinput_sink_state",
@@ -88,7 +94,12 @@ ohos_shared_library("libdinput_sink") {
     "window_manager:libdm",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/sink/transport/BUILD.gn

@@ -46,6 +46,12 @@ ohos_shared_library("libdinput_sink_trans") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${distributedinput_path}/services/transportbase:libdinput_trans_base",
@@ -70,7 +76,12 @@ ohos_shared_library("libdinput_sink_trans") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/source/inputinject/BUILD.gn

@@ -49,6 +49,12 @@ ohos_shared_library("libdinput_inject") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${services_state_path}:libdinput_sink_state",
@@ -72,7 +78,12 @@ ohos_shared_library("libdinput_inject") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/source/inputinject/test/sourceinjectunittest/BUILD.gn

@@ -28,7 +28,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
   module_out_path = module_out_path
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${innerkits_path}/include",
     "${ipc_path}/include",
     "${services_source_path}/inputinject/include",
@@ -39,8 +38,6 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
     "${service_common}/include",
     "${dfx_utils_path}/include",
     "${utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${distributedinput_path}/inputdevicehandler/include",
     "${common_path}/test/mock",
   ]
@@ -78,7 +75,9 @@ ohos_unittest("distributed_input_inner_sourceinject_test") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

services/source/sourcemanager/BUILD.gn

@@ -92,6 +92,12 @@ ohos_shared_library("libdinput_source") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${distributedinput_path}/services/transportbase:libdinput_trans_base",
@@ -123,7 +129,12 @@ ohos_shared_library("libdinput_source") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn

@@ -27,7 +27,6 @@ ohos_unittest("distributed_input_sourcemanager_test") {
   module_out_path = module_out_path
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${innerkits_path}/include",
     "${innerkits_path}/ipc/include",
     "${innerkits_path}/src",
@@ -43,8 +42,6 @@ ohos_unittest("distributed_input_sourcemanager_test") {
     "${services_source_path}/transport/include",
     "${dfx_utils_path}/include",
     "${utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${common_path}/test/mock",
     "${distributedinput_path}/services/transportbase/include",
     "${distributedinput_path}/utils/include",
@@ -120,6 +117,7 @@ ohos_unittest("distributed_input_sourcemanager_test") {
     "access_token:libtoken_setproc",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",

services/source/transport/BUILD.gn

@@ -45,6 +45,12 @@ ohos_shared_library("libdinput_source_trans") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${distributedinput_path}/services/transportbase:libdinput_trans_base",
@@ -68,7 +74,12 @@ ohos_shared_library("libdinput_source_trans") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/source/transport/test/sourcetransunittest/BUILD.gn

@@ -28,13 +28,10 @@ ohos_unittest("distributed_input_sourcetrans_test") {
   module_out_path = module_out_path
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_source_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${services_source_path}/transport/include",
@@ -80,6 +77,7 @@ ohos_unittest("distributed_input_sourcetrans_test") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",

services/state/BUILD.gn

@@ -49,6 +49,12 @@ ohos_shared_library("libdinput_sink_state") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${services_sink_path}/transport:libdinput_sink_trans",
@@ -70,7 +76,12 @@ ohos_shared_library("libdinput_sink_state") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/transportbase/BUILD.gn

@@ -44,6 +44,12 @@ ohos_shared_library("libdinput_trans_base") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${utils_path}:libdinput_utils",
@@ -66,7 +72,12 @@ ohos_shared_library("libdinput_trans_base") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

services/transportbase/test/transbaseunittest/BUILD.gn

@@ -28,12 +28,10 @@ ohos_unittest("distributed_input_transbase_test") {
   module_out_path = module_out_path
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${distributedinput_path}/services/source/transport/include",
     "${distributedinput_path}/services/sink/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${dfx_utils_path}/include",
@@ -78,6 +76,7 @@ ohos_unittest("distributed_input_transbase_test") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",

sinkhandler/BUILD.gn

@@ -50,6 +50,12 @@ ohos_shared_library("libdinput_sink_handler") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${innerkits_path}:libdinput_sdk",
@@ -68,7 +74,12 @@ ohos_shared_library("libdinput_sink_handler") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

sinkhandler/test/unittest/BUILD.gn

@@ -38,8 +38,6 @@ ohos_unittest("distributed_input_sink_handler_test") {
     "${service_common}/include",
     "${common_path}/include",
     "${dfx_utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -74,6 +72,7 @@ ohos_unittest("distributed_input_sink_handler_test") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hisysevent:libhisysevent",

sourcehandler/BUILD.gn

@@ -52,6 +52,12 @@ ohos_shared_library("libdinput_source_handler") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
+
   deps = [
     "${dfx_utils_path}:libdinput_dfx_utils",
     "${innerkits_path}:libdinput_sdk",
@@ -71,7 +77,12 @@ ohos_shared_library("libdinput_source_handler") {
     "samgr:samgr_proxy",
   ]
 
-  cflags_cc = [ "-DHILOG_ENABLE" ]
+  cflags_cc = [
+    "-DHILOG_ENABLE",
+    "-fstack-protector-strong",
+    "-D_FORTIFY_SOURCE=2",
+    "-O2",
+  ]
 
   subsystem_name = "distributedhardware"
 

sourcehandler/test/unittest/BUILD.gn

@@ -38,8 +38,6 @@ ohos_unittest("distributed_input_source_handler_test") {
     "${service_common}/include",
     "${common_path}/include",
     "${dfx_utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${distributedinput_path}/services/state/include",
     "${utils_path}/include",
@@ -75,6 +73,7 @@ ohos_unittest("distributed_input_source_handler_test") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hisysevent:libhisysevent",

test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn

@@ -24,8 +24,6 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputconfigdh_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -36,8 +34,6 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
     "${distributedinput_path}/services/state/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -55,7 +51,9 @@ ohos_fuzztest("DinputConfigDhFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/dinputinitsink_fuzzer/BUILD.gn

@@ -24,7 +24,6 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputinitsink_fuzzer"
 
   include_dirs = [
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -34,8 +33,6 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
     "${distributedinput_path}/inputdevicehandler/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -54,6 +51,7 @@ ohos_fuzztest("DinputInitSinkFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/dinputinitsource_fuzzer/BUILD.gn

@@ -24,8 +24,6 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputinitsource_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -36,8 +34,6 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
     "${distributedinput_path}/inputdevicehandler/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -55,7 +51,9 @@ ohos_fuzztest("DinputInitSourceFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn

@@ -24,11 +24,9 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputonsessionclosed_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_source_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${services_source_path}/transport/include",
@@ -56,6 +54,7 @@ ohos_fuzztest("DinputOnSessionClosedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",

test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn

@@ -24,11 +24,9 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputonsessionopend_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_source_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${services_source_path}/transport/include",
@@ -56,6 +54,7 @@ ohos_fuzztest("DinputOnSessionOpendFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",

test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn

@@ -24,7 +24,6 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputreleasesink_fuzzer"
 
   include_dirs = [
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -34,8 +33,6 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") {
     "${distributedinput_path}/inputdevicehandler/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -54,6 +51,7 @@ ohos_fuzztest("DinputReleaseSinkFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn

@@ -24,8 +24,6 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputreleasesource_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -36,8 +34,6 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") {
     "${distributedinput_path}/services/state/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -55,7 +51,9 @@ ohos_fuzztest("DinputReleaseSourceFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn

@@ -24,7 +24,6 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") {
       "${distributedinput_path}/test/fuzztest/dinputsubscribelocaldh_fuzzer"
 
   include_dirs = [
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -34,8 +33,6 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") {
     "${distributedinput_path}/inputdevicehandler/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -54,6 +51,7 @@ ohos_fuzztest("DinputSubscribeLocalDhFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/distributedinputclient_fuzzer/BUILD.gn

@@ -25,8 +25,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
       "${distributedinput_path}/test/fuzztest/distributedinputclient_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -38,8 +36,6 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
     "${distributedinput_path}/services/state/include",
     "${service_common}/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${utils_path}/include",
   ]
@@ -57,7 +53,9 @@ ohos_fuzztest("DistributedInputClientFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "eventhandler:libeventhandler",
     "hilog:libhilog",

test/fuzztest/distributedinputkit_fuzzer/BUILD.gn

@@ -25,7 +25,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
       "${distributedinput_path}/test/fuzztest/distributedinputkit_fuzzer"
 
   include_dirs = [
-    "include",
     "${distributedinput_path}/interfaces/inner_kits/include",
     "${distributedinput_path}/interfaces/ipc/include",
     "${distributedinput_path}/services/source/sourcemanager/include",
@@ -37,8 +36,6 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
     "${service_common}/include",
     "${common_path}/include",
     "${utils_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${services_source_path}/inputinject/include",
     "${distributedinput_path}/services/state/include",
   ]
@@ -57,6 +54,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") {
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributedhardwareutils",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn

@@ -24,12 +24,10 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
   fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsinktransport_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_sink_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
     "${frameworks_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${dfx_utils_path}/include",
     "${utils_path}/include",
@@ -55,6 +53,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",

test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn

@@ -24,11 +24,9 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
   fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputsourcetransport_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_source_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${services_source_path}/transport/include",
@@ -60,6 +58,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",

test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn

@@ -24,11 +24,9 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
   fuzz_config_file = "${distributedinput_path}/test/fuzztest/distributedinputtransportbase_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${services_source_path}/transport/include",
     "${distributedinput_path}/services/transportbase/include",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
     "${service_common}/include",
     "${services_source_path}/inputinject/include",
     "${services_source_path}/transport/include",
@@ -59,6 +57,7 @@ ohos_fuzztest("DistributedInputTransportBaseFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",

utils/BUILD.gn

@@ -44,6 +44,13 @@ ohos_shared_library("libdinput_utils") {
     "LOG_DOMAIN=0xD004120",
   ]
 
+  cflags = [
+    "-O2",
+    "-D_FORTIFY_SOURCE=2",
+  ]
+
+  cflags_cc = cflags
+
   external_deps = [
     "c_utils:utils",
     "distributed_hardware_fwk:distributed_av_receiver",

utils/test/unittest/BUILD.gn

@@ -28,12 +28,9 @@ ohos_unittest("distributed_input_utils_test") {
   module_out_path = module_out_path
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${utils_path}/include",
     "${utils_path}/test/unittest",
     "${common_path}/include",
-    "${fwk_interfaces_path}/include",
-    "${fwk_interfaces_path}/include/ipc",
     "${frameworks_path}/include",
     "${common_path}/test/mock",
     "${service_common}/include",
@@ -65,6 +62,7 @@ ohos_unittest("distributed_input_utils_test") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:distributedhardwareutils",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "hilog:libhilog",