From fb4eddad19448326d7052d89e826715ecc1ecebc Mon Sep 17 00:00:00 2001 From: oh_ci Date: Thu, 29 Aug 2024 11:16:22 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!222=20:?= =?UTF-8?q?=20=20=E5=90=AF=E5=8A=A8=E7=BC=96=E8=AF=91=E5=AE=8F=E6=89=93?= =?UTF-8?q?=E5=BC=80FS=E9=80=89=E9=A1=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dfx_utils/BUILD.gn | 13 +------------ inputdevicehandler/BUILD.gn | 13 +------------ interfaces/inner_kits/BUILD.gn | 13 +------------ services/sink/inputcollector/BUILD.gn | 13 +------------ services/sink/sinkmanager/BUILD.gn | 13 +------------ services/sink/transport/BUILD.gn | 13 +------------ services/source/inputinject/BUILD.gn | 13 +------------ services/source/sourcemanager/BUILD.gn | 13 +------------ services/source/transport/BUILD.gn | 13 +------------ services/state/BUILD.gn | 13 +------------ services/transportbase/BUILD.gn | 13 +------------ sinkhandler/BUILD.gn | 13 +------------ sourcehandler/BUILD.gn | 13 +------------ utils/BUILD.gn | 7 ------- 14 files changed, 13 insertions(+), 163 deletions(-) diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 5ed35ce..9a03a9d 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -45,12 +45,6 @@ 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 = [ @@ -64,12 +58,7 @@ ohos_shared_library("libdinput_dfx_utils") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 5c36f6a..18db9b3 100755 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -45,12 +45,6 @@ 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", @@ -72,12 +66,7 @@ ohos_shared_library("libdinput_handler") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index bcbcb96..6240ed4 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -95,12 +95,6 @@ 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", @@ -115,12 +109,7 @@ ohos_shared_library("libdinput_sdk") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 57cb891..3711531 100755 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -44,12 +44,6 @@ 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", @@ -71,12 +65,7 @@ ohos_shared_library("libdinput_collector") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 0c65940..806b1bd 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -55,12 +55,6 @@ 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", @@ -94,12 +88,7 @@ ohos_shared_library("libdinput_sink") { "window_manager:libdm", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index d82ddc2..05d4afa 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -46,12 +46,6 @@ 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", @@ -76,12 +70,7 @@ ohos_shared_library("libdinput_sink_trans") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 0c84f71..91829be 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -49,12 +49,6 @@ 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", @@ -78,12 +72,7 @@ ohos_shared_library("libdinput_inject") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index aa02846..11f8a32 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -92,12 +92,6 @@ 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", @@ -129,12 +123,7 @@ ohos_shared_library("libdinput_source") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index f5431b6..874649d 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -45,12 +45,6 @@ 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", @@ -74,12 +68,7 @@ ohos_shared_library("libdinput_source_trans") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 20e77df..8b01a01 100644 --- a/services/state/BUILD.gn +++ b/services/state/BUILD.gn @@ -49,12 +49,6 @@ 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", @@ -76,12 +70,7 @@ ohos_shared_library("libdinput_sink_state") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/services/transportbase/BUILD.gn b/services/transportbase/BUILD.gn index 622f14e..439a74d 100644 --- a/services/transportbase/BUILD.gn +++ b/services/transportbase/BUILD.gn @@ -44,12 +44,6 @@ 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", @@ -72,12 +66,7 @@ ohos_shared_library("libdinput_trans_base") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index b9a2c76..a49104d 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -50,12 +50,6 @@ 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", @@ -74,12 +68,7 @@ ohos_shared_library("libdinput_sink_handler") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index 1ba3d88..d054e1d 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -52,12 +52,6 @@ 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", @@ -77,12 +71,7 @@ ohos_shared_library("libdinput_source_handler") { "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-fstack-protector-strong", - "-D_FORTIFY_SOURCE=2", - "-O2", - ] + cflags_cc = [ "-DHILOG_ENABLE" ] subsystem_name = "distributedhardware" diff --git a/utils/BUILD.gn b/utils/BUILD.gn index af7c746..085b405 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -44,13 +44,6 @@ 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", -- Gitee