From bdfe8cf946154f4df9074add9be92d83ca87fca8 Mon Sep 17 00:00:00 2001 From: huangyicong Date: Thu, 7 Apr 2022 14:37:05 +0800 Subject: [PATCH 1/2] fix redundant options Signed-off-by: huangyicong --- base/BUILD.gn | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 81edf0a..b69632e 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -105,10 +105,9 @@ ohos_static_library("utilsbase") { sources = sources_utils sources += securec_sources configs = [ - ":utils_config", ":private_securec_config", ] - public_configs = [ ":static_utils_config" ] + public_configs = [ ":utils_config" ] defines = [ "CONFIG_HILOG" ] external_deps = [ "hilog_native:libhilog_base" ] @@ -120,10 +119,9 @@ ohos_shared_library("utils") { sources = sources_utils sources += securec_sources configs = [ - ":utils_config", ":private_securec_config", ] - public_configs = [ ":static_utils_config" ] + public_configs = [ ":utils_config" ] subsystem_name = "utils" defines = [ "CONFIG_HILOG" ] external_deps = [ "hilog_native:libhilog_base" ] @@ -137,10 +135,9 @@ ohos_shared_library("utils") { ohos_static_library("utilsecurec") { sources = securec_sources configs = [ - ":utils_config", ":private_securec_config", ] - public_configs = [ ":static_utils_config" ] + public_configs = [ ":utils_config" ] subsystem_name = "utils" part_name = "utils_base" } @@ -158,10 +155,9 @@ ohos_static_library("utilsecurec_ace_allplatforms") { cflags = [ "-Wno-inconsistent-dllimport" ] } configs = [ - ":utils_config", ":private_securec_config", ] - public_configs = [ ":static_utils_config" ] + public_configs = [ ":utils_config" ] subsystem_name = "utils" part_name = "utils_base" } @@ -169,7 +165,6 @@ ohos_static_library("utilsecurec_ace_allplatforms") { ohos_shared_library("utilsecurec_shared") { sources = securec_sources configs = [ - ":utils_config", ":private_securec_config", ] public_configs = [ ":utils_config" ] -- Gitee From da49525f91ebb6aaa0fce7571904a5598cf5bf66 Mon Sep 17 00:00:00 2001 From: huangyicong Date: Thu, 7 Apr 2022 14:51:04 +0800 Subject: [PATCH 2/2] fix redundant options Signed-off-by: huangyicong --- base/BUILD.gn | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index b69632e..539954d 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -104,9 +104,7 @@ securec_sources = [ ohos_static_library("utilsbase") { sources = sources_utils sources += securec_sources - configs = [ - ":private_securec_config", - ] + configs = [ ":private_securec_config" ] public_configs = [ ":utils_config" ] defines = [ "CONFIG_HILOG" ] external_deps = [ "hilog_native:libhilog_base" ] @@ -118,9 +116,7 @@ ohos_static_library("utilsbase") { ohos_shared_library("utils") { sources = sources_utils sources += securec_sources - configs = [ - ":private_securec_config", - ] + configs = [ ":private_securec_config" ] public_configs = [ ":utils_config" ] subsystem_name = "utils" defines = [ "CONFIG_HILOG" ] @@ -134,9 +130,7 @@ ohos_shared_library("utils") { ohos_static_library("utilsecurec") { sources = securec_sources - configs = [ - ":private_securec_config", - ] + configs = [ ":private_securec_config" ] public_configs = [ ":utils_config" ] subsystem_name = "utils" part_name = "utils_base" @@ -154,9 +148,7 @@ ohos_static_library("utilsecurec_ace_allplatforms") { ] cflags = [ "-Wno-inconsistent-dllimport" ] } - configs = [ - ":private_securec_config", - ] + configs = [ ":private_securec_config" ] public_configs = [ ":utils_config" ] subsystem_name = "utils" part_name = "utils_base" @@ -164,9 +156,7 @@ ohos_static_library("utilsecurec_ace_allplatforms") { ohos_shared_library("utilsecurec_shared") { sources = securec_sources - configs = [ - ":private_securec_config", - ] + configs = [ ":private_securec_config" ] public_configs = [ ":utils_config" ] part_name = "utils_base" install_images = [ -- Gitee