From 4ad5569f961335ce0bf5685327f94f3bcd94d71e Mon Sep 17 00:00:00 2001 From: suoqilong Date: Tue, 8 Apr 2025 07:08:27 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=BC=96=E8=AF=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=95=B4=E6=94=B9-0408?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suoqilong --- .../distributeddataservice/adapter/account/BUILD.gn | 5 +---- .../adapter/communicator/BUILD.gn | 5 +---- services/distributeddataservice/adapter/dfx/BUILD.gn | 5 +---- .../distributeddataservice/adapter/network/BUILD.gn | 2 -- .../adapter/schema_helper/BUILD.gn | 5 +---- .../distributeddataservice/adapter/screenlock/BUILD.gn | 5 +---- services/distributeddataservice/adapter/utils/BUILD.gn | 5 +---- services/distributeddataservice/app/BUILD.gn | 2 -- .../distributeddataservice/app/src/checker/BUILD.gn | 6 +----- .../distributeddataservice/app/src/installer/BUILD.gn | 6 +----- services/distributeddataservice/framework/BUILD.gn | 6 +----- .../rust/connect_adapter/BUILD.gn | 10 ++-------- .../distributeddataservice/rust/extension/BUILD.gn | 6 +----- services/distributeddataservice/service/BUILD.gn | 7 +------ .../distributeddataservice/service/backup/BUILD.gn | 2 -- .../distributeddataservice/service/bootstrap/BUILD.gn | 2 -- services/distributeddataservice/service/cloud/BUILD.gn | 2 -- .../distributeddataservice/service/common/BUILD.gn | 2 -- .../distributeddataservice/service/config/BUILD.gn | 2 -- .../distributeddataservice/service/crypto/BUILD.gn | 2 -- .../distributeddataservice/service/data_share/BUILD.gn | 2 -- .../distributeddataservice/service/dumper/BUILD.gn | 2 -- services/distributeddataservice/service/kvdb/BUILD.gn | 2 -- .../distributeddataservice/service/matrix/BUILD.gn | 2 -- .../distributeddataservice/service/object/BUILD.gn | 2 -- .../distributeddataservice/service/permission/BUILD.gn | 2 -- services/distributeddataservice/service/rdb/BUILD.gn | 2 -- services/distributeddataservice/service/udmf/BUILD.gn | 2 -- 28 files changed, 13 insertions(+), 90 deletions(-) diff --git a/services/distributeddataservice/adapter/account/BUILD.gn b/services/distributeddataservice/adapter/account/BUILD.gn index fc643f996..85697b11b 100755 --- a/services/distributeddataservice/adapter/account/BUILD.gn +++ b/services/distributeddataservice/adapter/account/BUILD.gn @@ -35,10 +35,7 @@ ohos_source_set("distributeddata_account") { "${data_service_path}/framework/include/account", ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] remove_configs = [ "//build/config/compiler:no_exceptions" ] diff --git a/services/distributeddataservice/adapter/communicator/BUILD.gn b/services/distributeddataservice/adapter/communicator/BUILD.gn index 522a20c21..ff2d7cf86 100755 --- a/services/distributeddataservice/adapter/communicator/BUILD.gn +++ b/services/distributeddataservice/adapter/communicator/BUILD.gn @@ -49,10 +49,7 @@ ohos_source_set("distributeddata_communicator") { "${data_service_path}/framework/include/utils", ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils", diff --git a/services/distributeddataservice/adapter/dfx/BUILD.gn b/services/distributeddataservice/adapter/dfx/BUILD.gn index 483c45449..dc2a52cb3 100644 --- a/services/distributeddataservice/adapter/dfx/BUILD.gn +++ b/services/distributeddataservice/adapter/dfx/BUILD.gn @@ -50,10 +50,7 @@ ohos_source_set("distributeddata_dfx") { "${data_service_path}/framework/include/utils", ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] external_deps = [ "c_utils:utils", diff --git a/services/distributeddataservice/adapter/network/BUILD.gn b/services/distributeddataservice/adapter/network/BUILD.gn index f120004b8..fb25666a3 100644 --- a/services/distributeddataservice/adapter/network/BUILD.gn +++ b/services/distributeddataservice/adapter/network/BUILD.gn @@ -37,7 +37,6 @@ ohos_source_set("distributeddata_network") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] configs = [ ":network_public_config" ] @@ -49,7 +48,6 @@ ohos_source_set("distributeddata_network") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] external_deps = [ "kv_store:datamgr_common" ] diff --git a/services/distributeddataservice/adapter/schema_helper/BUILD.gn b/services/distributeddataservice/adapter/schema_helper/BUILD.gn index 4bfbe3be2..26095037d 100644 --- a/services/distributeddataservice/adapter/schema_helper/BUILD.gn +++ b/services/distributeddataservice/adapter/schema_helper/BUILD.gn @@ -29,10 +29,7 @@ ohos_source_set("distributeddata_schema_helper") { } sources = [ "src/get_schema_helper.cpp" ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] include_dirs = [ "../include/schema_helper" ] diff --git a/services/distributeddataservice/adapter/screenlock/BUILD.gn b/services/distributeddataservice/adapter/screenlock/BUILD.gn index 28f3b0b78..ed1fd3913 100644 --- a/services/distributeddataservice/adapter/screenlock/BUILD.gn +++ b/services/distributeddataservice/adapter/screenlock/BUILD.gn @@ -24,10 +24,7 @@ ohos_source_set("distributeddata_screenlock") { } sources = [ "src/screen_lock.cpp" ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] include_dirs = [ "../include/screenlock", diff --git a/services/distributeddataservice/adapter/utils/BUILD.gn b/services/distributeddataservice/adapter/utils/BUILD.gn index 8325bf050..f96b7fe3e 100755 --- a/services/distributeddataservice/adapter/utils/BUILD.gn +++ b/services/distributeddataservice/adapter/utils/BUILD.gn @@ -24,10 +24,7 @@ ohos_source_set("distributeddata_utils") { } sources = [ "src/kvstore_utils.cpp" ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] if (build_public_version) { cflags_cc += [ "-DCONFIG_PUBLIC_VERSION" ] diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index b66d01341..7748c2fda 100644 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -76,13 +76,11 @@ config("module_private_config") { "-Oz", "-fdata-sections", "-ffunction-sections", - "-fstack-protector-strong", ] cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] diff --git a/services/distributeddataservice/app/src/checker/BUILD.gn b/services/distributeddataservice/app/src/checker/BUILD.gn index 6695b0d65..575e9fad2 100644 --- a/services/distributeddataservice/app/src/checker/BUILD.gn +++ b/services/distributeddataservice/app/src/checker/BUILD.gn @@ -30,7 +30,6 @@ ohos_source_set("distributeddata_checker") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "${data_service_path}/framework/include" ] @@ -40,10 +39,7 @@ ohos_source_set("distributeddata_checker") { } ldflags = [ "-Wl,-z,relro,-z,now,--exclude-libs,ALL" ] deps = [ "${data_service_path}/adapter/utils:distributeddata_utils" ] - cflags = [ - "-Oz", - "-fstack-protector-strong", - ] + cflags = [ "-Oz" ] external_deps = [ "ability_base:base", "ability_base:want", diff --git a/services/distributeddataservice/app/src/installer/BUILD.gn b/services/distributeddataservice/app/src/installer/BUILD.gn index 49eb62d2f..0ccfc73e8 100644 --- a/services/distributeddataservice/app/src/installer/BUILD.gn +++ b/services/distributeddataservice/app/src/installer/BUILD.gn @@ -40,13 +40,9 @@ ohos_source_set("distributeddata_installer") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] - cflags = [ - "-Oz", - "-fstack-protector-strong", - ] + cflags = [ "-Oz" ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk", diff --git a/services/distributeddataservice/framework/BUILD.gn b/services/distributeddataservice/framework/BUILD.gn index 969705735..9270da8f4 100644 --- a/services/distributeddataservice/framework/BUILD.gn +++ b/services/distributeddataservice/framework/BUILD.gn @@ -124,15 +124,11 @@ ohos_shared_library("distributeddatasvcfwk") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-fdata-sections", "-ffunction-sections", - "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] configs = [ ":module_config" ] diff --git a/services/distributeddataservice/rust/connect_adapter/BUILD.gn b/services/distributeddataservice/rust/connect_adapter/BUILD.gn index 292dc2003..49162568b 100644 --- a/services/distributeddataservice/rust/connect_adapter/BUILD.gn +++ b/services/distributeddataservice/rust/connect_adapter/BUILD.gn @@ -34,14 +34,8 @@ ohos_shared_library("conn_adapter") { "src/connect_wrapper.cpp", ] configs = [ ":export_connect" ] - cflags = [ - "-Werror", - "-fstack-protector-strong", - ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags = [ "-Werror" ] + cflags_cc = [ "-fvisibility=hidden" ] external_deps = [ "ability_base:want", diff --git a/services/distributeddataservice/rust/extension/BUILD.gn b/services/distributeddataservice/rust/extension/BUILD.gn index 6730b9901..d1c0fdc1d 100644 --- a/services/distributeddataservice/rust/extension/BUILD.gn +++ b/services/distributeddataservice/rust/extension/BUILD.gn @@ -47,13 +47,9 @@ ohos_shared_library("opencloudextension") { cflags = [ "-Werror", "-Wno-multichar", - "-fstack-protector-strong", ] - cflags_cc = [ - "-fvisibility=hidden", - "-fstack-protector-strong", - ] + cflags_cc = [ "-fvisibility=hidden" ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn index b07724a03..6274b1d1c 100644 --- a/services/distributeddataservice/service/BUILD.gn +++ b/services/distributeddataservice/service/BUILD.gn @@ -42,10 +42,7 @@ config("module_public_config") { "${kv_store_distributeddb_path}/interfaces/include/", "${kv_store_distributeddb_path}/interfaces/include/relational", ] - cflags = [ - "-Wno-c99-designator", - "-fstack-protector-strong", - ] + cflags = [ "-Wno-c99-designator" ] } ohos_shared_library("distributeddatasvc") { @@ -66,7 +63,6 @@ ohos_shared_library("distributeddatasvc") { "-Oz", "-fdata-sections", "-ffunction-sections", - "-fstack-protector-strong", ] ldflags = [ "-Wl,-z,relro,-z,now,--gc-sections" ] @@ -74,7 +70,6 @@ ohos_shared_library("distributeddatasvc") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/backup/BUILD.gn b/services/distributeddataservice/service/backup/BUILD.gn index 6a492ef4b..6b90fa32f 100755 --- a/services/distributeddataservice/service/backup/BUILD.gn +++ b/services/distributeddataservice/service/backup/BUILD.gn @@ -32,7 +32,6 @@ ohos_source_set("distributeddata_backup") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ @@ -47,7 +46,6 @@ ohos_source_set("distributeddata_backup") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/bootstrap/BUILD.gn b/services/distributeddataservice/service/bootstrap/BUILD.gn index 70b1c24c0..ff48eaece 100644 --- a/services/distributeddataservice/service/bootstrap/BUILD.gn +++ b/services/distributeddataservice/service/bootstrap/BUILD.gn @@ -32,7 +32,6 @@ ohos_source_set("distributeddata_bootstrap") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "${data_service_path}/service/config/include" ] @@ -44,7 +43,6 @@ ohos_source_set("distributeddata_bootstrap") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/cloud/BUILD.gn b/services/distributeddataservice/service/cloud/BUILD.gn index 3c592276d..b36909c07 100755 --- a/services/distributeddataservice/service/cloud/BUILD.gn +++ b/services/distributeddataservice/service/cloud/BUILD.gn @@ -39,7 +39,6 @@ ohos_source_set("distributeddata_cloud") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ @@ -60,7 +59,6 @@ ohos_source_set("distributeddata_cloud") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/common/BUILD.gn b/services/distributeddataservice/service/common/BUILD.gn index 7a493bd1b..3a8e1990d 100644 --- a/services/distributeddataservice/service/common/BUILD.gn +++ b/services/distributeddataservice/service/common/BUILD.gn @@ -31,7 +31,6 @@ ohos_source_set("distributeddata_common") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -41,7 +40,6 @@ ohos_source_set("distributeddata_common") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/config/BUILD.gn b/services/distributeddataservice/service/config/BUILD.gn index 9349f8113..a2ea71cf4 100644 --- a/services/distributeddataservice/service/config/BUILD.gn +++ b/services/distributeddataservice/service/config/BUILD.gn @@ -39,7 +39,6 @@ ohos_source_set("distributeddata_config") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ @@ -53,7 +52,6 @@ ohos_source_set("distributeddata_config") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/crypto/BUILD.gn b/services/distributeddataservice/service/crypto/BUILD.gn index 18b166a96..2b8003be8 100644 --- a/services/distributeddataservice/service/crypto/BUILD.gn +++ b/services/distributeddataservice/service/crypto/BUILD.gn @@ -32,7 +32,6 @@ ohos_source_set("distributeddata_crypto") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -43,7 +42,6 @@ ohos_source_set("distributeddata_crypto") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] configs = [ ":crypto_public_config" ] public_configs = [ ":crypto_public_config" ] diff --git a/services/distributeddataservice/service/data_share/BUILD.gn b/services/distributeddataservice/service/data_share/BUILD.gn index 3633536ec..8a6a2bfcb 100644 --- a/services/distributeddataservice/service/data_share/BUILD.gn +++ b/services/distributeddataservice/service/data_share/BUILD.gn @@ -95,13 +95,11 @@ ohos_source_set("data_share_service") { "-Wno-multichar", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] configs = [ ":module_public_config" ] diff --git a/services/distributeddataservice/service/dumper/BUILD.gn b/services/distributeddataservice/service/dumper/BUILD.gn index 9ba04db73..72b194d79 100644 --- a/services/distributeddataservice/service/dumper/BUILD.gn +++ b/services/distributeddataservice/service/dumper/BUILD.gn @@ -27,7 +27,6 @@ ohos_source_set("distributeddata_dumper") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -38,7 +37,6 @@ ohos_source_set("distributeddata_dumper") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] diff --git a/services/distributeddataservice/service/kvdb/BUILD.gn b/services/distributeddataservice/service/kvdb/BUILD.gn index 9f1d96dae..874dc361c 100644 --- a/services/distributeddataservice/service/kvdb/BUILD.gn +++ b/services/distributeddataservice/service/kvdb/BUILD.gn @@ -55,7 +55,6 @@ ohos_source_set("distributeddata_kvdb") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] cflags = [ @@ -64,7 +63,6 @@ ohos_source_set("distributeddata_kvdb") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/matrix/BUILD.gn b/services/distributeddataservice/service/matrix/BUILD.gn index 3499cbe6c..e7f2d0a63 100755 --- a/services/distributeddataservice/service/matrix/BUILD.gn +++ b/services/distributeddataservice/service/matrix/BUILD.gn @@ -35,7 +35,6 @@ ohos_source_set("distributeddata_matrix") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ @@ -50,7 +49,6 @@ ohos_source_set("distributeddata_matrix") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/object/BUILD.gn b/services/distributeddataservice/service/object/BUILD.gn index 29056fe07..e76a7510e 100644 --- a/services/distributeddataservice/service/object/BUILD.gn +++ b/services/distributeddataservice/service/object/BUILD.gn @@ -49,7 +49,6 @@ ohos_source_set("distributeddata_object") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ "include" ] @@ -62,7 +61,6 @@ ohos_source_set("distributeddata_object") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/permission/BUILD.gn b/services/distributeddataservice/service/permission/BUILD.gn index 0f28d2778..2795bda98 100644 --- a/services/distributeddataservice/service/permission/BUILD.gn +++ b/services/distributeddataservice/service/permission/BUILD.gn @@ -36,7 +36,6 @@ ohos_source_set("distributeddata_permit") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] include_dirs = [ @@ -52,7 +51,6 @@ ohos_source_set("distributeddata_permit") { "-Wno-c99-designator", "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Oz", - "-fstack-protector-strong", ] deps = [ diff --git a/services/distributeddataservice/service/rdb/BUILD.gn b/services/distributeddataservice/service/rdb/BUILD.gn index ad693d92d..9c126c795 100644 --- a/services/distributeddataservice/service/rdb/BUILD.gn +++ b/services/distributeddataservice/service/rdb/BUILD.gn @@ -63,7 +63,6 @@ ohos_source_set("distributeddata_rdb") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Werror", "-Oz", - "-fstack-protector-strong", ] deps = [ @@ -97,7 +96,6 @@ ohos_source_set("distributeddata_rdb") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] subsystem_name = "distributeddatamgr" diff --git a/services/distributeddataservice/service/udmf/BUILD.gn b/services/distributeddataservice/service/udmf/BUILD.gn index 971ab2721..8176548a1 100644 --- a/services/distributeddataservice/service/udmf/BUILD.gn +++ b/services/distributeddataservice/service/udmf/BUILD.gn @@ -70,7 +70,6 @@ ohos_source_set("udmf_server") { "-D_LIBCPP_HAS_COND_CLOCKWAIT", "-Werror", "-Oz", - "-fstack-protector-strong", ] deps = [ "${data_service_path}/framework:distributeddatasvcfwk" ] @@ -95,7 +94,6 @@ ohos_source_set("udmf_server") { cflags_cc = [ "-fvisibility=hidden", "-Oz", - "-fstack-protector-strong", ] subsystem_name = "distributeddatamgr" -- Gitee