From 55a8d8a5e8ac87fc3ff285472a75df3b2cab3ecf Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Sun, 13 Oct 2024 10:43:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E4=BE=9D=E8=B5=96=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E3=80=81=E5=90=AF=E5=8A=A8=E7=BC=96=E8=AF=91=E9=80=89?= =?UTF-8?q?=E9=A1=B9FS=E9=80=89=E9=A1=B9=E5=9B=9E=E5=90=885.0.1-release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- dfx_utils/BUILD.gn | 13 ++++++++++++- inputdevicehandler/BUILD.gn | 13 ++++++++++++- interfaces/inner_kits/BUILD.gn | 13 ++++++++++++- .../test/addwhitelistinfoscallbackunittest/BUILD.gn | 2 -- .../test/delwhitelistinfoscallbackunittest/BUILD.gn | 2 -- .../ipc/test/dinputsourcecallbackunittest/BUILD.gn | 2 -- .../fuzztest/distributedinputstub_fuzzer/BUILD.gn | 4 +--- .../test/unpreparedinputcallbackunittest/BUILD.gn | 2 -- .../test/unregisterdinputcallbackunittest/BUILD.gn | 2 -- services/sink/inputcollector/BUILD.gn | 13 ++++++++++++- services/sink/sinkmanager/BUILD.gn | 13 ++++++++++++- services/sink/transport/BUILD.gn | 13 ++++++++++++- services/source/inputinject/BUILD.gn | 13 ++++++++++++- .../inputinject/test/sourceinjectunittest/BUILD.gn | 5 ++--- services/source/sourcemanager/BUILD.gn | 13 ++++++++++++- .../test/sourcemanagerunittest/BUILD.gn | 4 +--- services/source/transport/BUILD.gn | 13 ++++++++++++- .../transport/test/sourcetransunittest/BUILD.gn | 4 +--- services/state/BUILD.gn | 13 ++++++++++++- services/transportbase/BUILD.gn | 13 ++++++++++++- .../transportbase/test/transbaseunittest/BUILD.gn | 3 +-- sinkhandler/BUILD.gn | 13 ++++++++++++- sinkhandler/test/unittest/BUILD.gn | 3 +-- sourcehandler/BUILD.gn | 13 ++++++++++++- sourcehandler/test/unittest/BUILD.gn | 3 +-- test/fuzztest/dinputconfigdh_fuzzer/BUILD.gn | 6 ++---- test/fuzztest/dinputinitsink_fuzzer/BUILD.gn | 4 +--- test/fuzztest/dinputinitsource_fuzzer/BUILD.gn | 6 ++---- test/fuzztest/dinputonsessionclosed_fuzzer/BUILD.gn | 3 +-- test/fuzztest/dinputonsessionopend_fuzzer/BUILD.gn | 3 +-- test/fuzztest/dinputreleasesink_fuzzer/BUILD.gn | 4 +--- test/fuzztest/dinputreleasesource_fuzzer/BUILD.gn | 6 ++---- .../fuzztest/dinputsubscribelocaldh_fuzzer/BUILD.gn | 4 +--- .../fuzztest/distributedinputclient_fuzzer/BUILD.gn | 6 ++---- test/fuzztest/distributedinputkit_fuzzer/BUILD.gn | 4 +--- .../distributedinputsinktransport_fuzzer/BUILD.gn | 3 +-- .../distributedinputsourcetransport_fuzzer/BUILD.gn | 3 +-- .../distributedinputtransportbase_fuzzer/BUILD.gn | 3 +-- utils/BUILD.gn | 7 +++++++ utils/test/unittest/BUILD.gn | 4 +--- 40 files changed, 189 insertions(+), 82 deletions(-) diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 9a03a9d..5ed35ce 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 18db9b3..5c36f6a 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 6240ed4..bcbcb96 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 a4e88ea..df605cf 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 eebbae1..80d3d10 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 1d134a5..9a2b0af 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 4aeb961..32ece36 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 7091aae..d18c30d 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 9f28278..1acd7b1 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 3711531..57cb891 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 806b1bd..0c65940 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 05d4afa..d82ddc2 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 91829be..0c84f71 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 29a542b..8bcdd98 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 11f8a32..aa02846 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 eb21b67..9049c4d 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 874649d..f5431b6 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 9decfe3..10d33f3 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 8b01a01..20e77df 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 439a74d..622f14e 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 c95459e..14c9a6d 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 a49104d..b9a2c76 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 51356ca..60c928e 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 d054e1d..1ba3d88 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 4a97320..1552a55 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 618ff36..9e19f17 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 a32520f..59a5609 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 47708c9..5851cfc 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 712c739..e01d84a 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 6118282..dbc16d7 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 dee65b3..da48302 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 b336826..feed3f0 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 244ac95..6f6dbdf 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 e0385bb..ed010c2 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 5446cee..903bd09 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 cda17bf..bdc0ac2 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 c49970b..d64cc59 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 ef8e18b..455674a 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 085b405..af7c746 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 8e73687..8907d48 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", -- Gitee