diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 9a03a9d5e97cb89035db8a168908e403eabb4928..5ed35ceae89a27b7eac26564ce591088ec2e01db 100755 --- a/dfx_utils/BUILD.gn +++ b/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" diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 18db9b3a2d54d8a4f8cec549e28168e057f904c8..5c36f6a5c291ddba11d11f1da6005fbd6ea56181 100755 --- a/inputdevicehandler/BUILD.gn +++ b/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" diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 6240ed4981bd0c02811be1741201c2db8d45ab19..bcbcb96146ffbbc488738ad87f5ede788e433964 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/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" diff --git a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn index a4e88ea9df5c7d120ee3d39926e2f82bfe33d59b..df605cf378e64ba9feed46f5cd8dc30521f04b11 100644 --- a/interfaces/ipc/test/addwhitelistinfoscallbackunittest/BUILD.gn +++ b/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", diff --git a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn b/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn index eebbae10fe83354be486ce3b506d5304bfdb8f73..80d3d10d6f8e3f397a81b31f47f82e83eafa8f7b 100644 --- a/interfaces/ipc/test/delwhitelistinfoscallbackunittest/BUILD.gn +++ b/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", diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn b/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn index 1d134a56364769811ab4fe7a92c2845d9c089d06..9a2b0af55434ea8dcffa2b3c6121475972e93ad0 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/BUILD.gn +++ b/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", diff --git a/interfaces/ipc/test/fuzztest/distributedinputstub_fuzzer/BUILD.gn b/interfaces/ipc/test/fuzztest/distributedinputstub_fuzzer/BUILD.gn index 4aeb9613401742cd2fbf1439111f2a11dbdf2395..32ece36051383576958e5fa8123a91a30d3b8a63 100644 --- a/interfaces/ipc/test/fuzztest/distributedinputstub_fuzzer/BUILD.gn +++ b/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", diff --git a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn index 7091aae4ed0426080072b3da4eed990d9fbde0e3..d18c30d4f885211e1a8a958db32418cfb85f17e7 100644 --- a/interfaces/ipc/test/unpreparedinputcallbackunittest/BUILD.gn +++ b/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", diff --git a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn b/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn index 9f28278e00637fb83a19f167ff156a4454f31187..1acd7b13af9e505a07dab6947f2e9e50b9c816cb 100644 --- a/interfaces/ipc/test/unregisterdinputcallbackunittest/BUILD.gn +++ b/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", diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 37115311d9203016206cba760f4e6228299dbfce..57cb89159092e389a0de4cb4d8c531a3a6f0b4ff 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/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" diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 806b1bdfc98e5b67ea82ffdb77b7333b9430aecc..0c659407b4ba33b0f73d6c9a6e0bd8a177c1526d 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/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" diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 05d4afa7ab345b34dcb801723265bea31c9dac5e..d82ddc2bc28aa3dc11fa774e787e390ce4f0bf5a 100644 --- a/services/sink/transport/BUILD.gn +++ b/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" diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 91829be7d54a6ac893f1ba6ba39fe5c0f84f9682..0c84f71d0bdcd6a83d7951a10b5dc3e7ad10296c 100644 --- a/services/source/inputinject/BUILD.gn +++ b/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" diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 29a542b23199b394244cff446d2a73848153c29f..8bcdd98402f24386aa98b0902b4d27ca65f40bcf 100755 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/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", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 11f8a32537335a0ff3028f7b3dfc8e17fdbeda02..aa02846825ffc0a613edd4d3defea3cb90b6e540 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/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" diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index eb21b670dc4ef69c9c263847292147527cd4905b..9049c4d9b6fe788529369ff3f06bed93df3e73d1 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/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", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 874649db056fe41972e9bebea69ee80b86db5e74..f5431b6bf30e638237e5262ba100d8ba09cdc1bf 100755 --- a/services/source/transport/BUILD.gn +++ b/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" diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 9decfe38d0367f02f05c05b3587d240b10079d72..10d33f331ef8f9611c3eee39ba146483cb6d3e95 100755 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/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", diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 8b01a01fa44fe1a58be841f3a36bacddb7429be6..20e77dfd9a7f2ef5a5015ecb68e492d5733f8ffc 100644 --- a/services/state/BUILD.gn +++ b/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" diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 439a74d5742ad8e18cad3547161467e361a6c84a..622f14e736ffdda4bdf8824205a4e43b434c667b 100644 --- a/services/transportbase/BUILD.gn +++ b/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" diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index c95459eebfda69dded17221b5557712c183493f7..14c9a6d4cbe93acc9222ecf33cfb40657923fc66 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/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", diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index a49104dee22a4d0a1ac63561596a3b9e8425d65b..b9a2c76946e8abfe8d815cb747becfb6ab6796de 100644 --- a/sinkhandler/BUILD.gn +++ b/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" diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 51356ca9d2acc92e7226c62aea85466f287ea265..60c928e8064fa00f174f853dbcb3204c48ba96bb 100755 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/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", diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index d054e1d67eff2db49a12b3b0779b31de92094c4e..1ba3d8803ee9c891598e01c397c38c0666fbcb67 100644 --- a/sourcehandler/BUILD.gn +++ b/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" diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 4a973203c60c075636fdf23f04651c8c7cc3f911..1552a55dae7763af643697ab03bff9c7258cac08 100755 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn b/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn index 618ff369ecbf5366f17c48d1818ff33a2b3cfdf8..9e19f17628ea1c6cc4e0a13c7d65f59a25617810 100644 --- a/test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn index a32520f94775967478bc1e34dc9518153bc72637..59a5609c7f247faacb2f56916a4b620f05f0b555 100644 --- a/test/fuzztest/dinputinitsink_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn b/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn index 47708c91a9cd1d1802686bb1ea2500271c21a0c0..5851cfc3adf120677e0835c14440e4679aadeda4 100644 --- a/test/fuzztest/dinputinitsource_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn index 712c7393f1968bc8fc616c03a1c0ff72a9e7915d..e01d84a61205238e35bbb66a13a31b5b1c049a53 100644 --- a/test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn b/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn index 6118282ae8b3a8c2bccb3eb57af3d119ea214d86..dbc16d71534a93faa399911f2d891055983dc6c1 100644 --- a/test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn index dee65b3a7bbec08df94ed848ca812c4e8d99706d..da48302924e0e4639a83175e9f2eea4324c4bcc8 100644 --- a/test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn b/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn index b3368268e12718699713783dfa04b95ce5011087..feed3f09b3322e8299a9d59fe3e00f1f4fed9faa 100644 --- a/test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn b/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn index 244ac95a83ccc5e233e41b83c0ba50a47571cd65..6f6dbdf94073a3070fb2faafe7708af1f389e6b3 100644 --- a/test/fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index e0385bb734d8a06e68d9d14995f68d8152182b50..ed010c2231e1c2ffd47a51c2617b4d80cb44511b 100755 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 5446ceef6e404d127393c85f7051d45de1d71f54..903bd0989cdbf5e57f037e273a9cd6e88d2c7550 100755 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index cda17bf0287bc70bf4b1203faea9f5da4fb11c66..bdc0ac2f9e9a40e45328623247ad4c537b0290f1 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index c49970bd21d4a00ce2d0f2278c838f567610f0d5..d64cc59d6f4f57c28c207ee75cf599e4001fced4 100755 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/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", diff --git a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn b/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn index ef8e18b2dd1a600592f1a59a8f831df656572151..455674a774dd33bf3845c6ce2e015f8ed3cb52d5 100644 --- a/test/fuzztest/distributedinputtransportbase_fuzzer/BUILD.gn +++ b/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", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 085b405ae3ddb696a3f15e79041b4ff082bc8569..af7c74669168056a68733ed8aed26c66a52258e0 100644 --- a/utils/BUILD.gn +++ b/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", diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn index 8e736870d970f0d31cc2db934783ea3cf4b2333b..8907d486391fe94409eec4a1787743f48637a97d 100644 --- a/utils/test/unittest/BUILD.gn +++ b/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",