diff --git a/base/BUILD.gn b/base/BUILD.gn index 3742cae4c4d41bb17f84931fb206cb97f5b385e7..30ab0f6f0252aa51dd880256a12769f21ecd0622 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -23,7 +23,10 @@ config("utils_config") { if (current_os == "mingw") { cflags += [ "-Wno-error=inconsistent-dllimport" ] } - cflags += [ "-Wno-implicit-fallthrough" ] +} + +config("private_securec_config") { + cflags = [ "-Wno-implicit-fallthrough" ] } config("static_utils_config") { @@ -53,6 +56,9 @@ sources_utils = [ "src/timer_event_handler.cpp", "src/ashmem.cpp", "src/rwlock.cpp", +] + +securec_sources = [ "src/securec/fscanf_s.c", "src/securec/fwscanf_s.c", "src/securec/gets_s.c", @@ -79,6 +85,7 @@ sources_utils = [ "src/securec/vfwscanf_s.c", "src/securec/vscanf_s.c", "src/securec/vsnprintf_s.c", + "src/securec/vsnprintf_s_p.c", "src/securec/vsprintf_s.c", "src/securec/vsscanf_s.c", "src/securec/vswprintf_s.c", @@ -96,14 +103,23 @@ sources_utils = [ ohos_static_library("utilsbase") { sources = sources_utils - configs = [ ":utils_config" ] + sources += securec_sources + configs = [ + ":utils_config", + ":private_securec_config", + ] defines = [ "CONFIG_HILOG" ] external_deps = [ "hilog_native:libhilog" ] } ohos_shared_library("utils") { sources = sources_utils - configs = [ ":utils_config" ] + sources += securec_sources + configs = [ + ":utils_config", + ":private_securec_config", + ] + public_configs = [ ":static_utils_config" ] subsystem_name = "utils" defines = [ "CONFIG_HILOG" ] external_deps = [ "hilog_native:libhilog" ] @@ -114,58 +130,21 @@ ohos_shared_library("utils") { ] } -securec_sources = [ - "src/securec/fscanf_s.c", - "src/securec/fwscanf_s.c", - "src/securec/gets_s.c", - "src/securec/memcpy_s.c", - "src/securec/memmove_s.c", - "src/securec/memset_s.c", - "src/securec/scanf_s.c", - "src/securec/securecutil.c", - "src/securec/secureinput_a.c", - "src/securec/secureinput_w.c", - "src/securec/secureprintoutput_a.c", - "src/securec/secureprintoutput_w.c", - "src/securec/snprintf_s.c", - "src/securec/sprintf_s.c", - "src/securec/sscanf_s.c", - "src/securec/strcat_s.c", - "src/securec/strcpy_s.c", - "src/securec/strncat_s.c", - "src/securec/strncpy_s.c", - "src/securec/strtok_s.c", - "src/securec/swprintf_s.c", - "src/securec/swscanf_s.c", - "src/securec/vfscanf_s.c", - "src/securec/vfwscanf_s.c", - "src/securec/vscanf_s.c", - "src/securec/vsnprintf_s.c", - "src/securec/vsnprintf_s_p.c", - "src/securec/vsprintf_s.c", - "src/securec/vsscanf_s.c", - "src/securec/vswprintf_s.c", - "src/securec/vswscanf_s.c", - "src/securec/vwscanf_s.c", - "src/securec/wcscat_s.c", - "src/securec/wcscpy_s.c", - "src/securec/wcsncat_s.c", - "src/securec/wcsncpy_s.c", - "src/securec/wcstok_s.c", - "src/securec/wmemcpy_s.c", - "src/securec/wmemmove_s.c", - "src/securec/wscanf_s.c", -] - ohos_static_library("utilsecurec") { sources = securec_sources - configs = [ ":utils_config" ] + configs = [ + ":utils_config", + ":private_securec_config", + ] } if (build_public_version) { ohos_shared_library("utilsecurec_shared") { sources = securec_sources - configs = [ ":utils_config" ] + configs = [ + ":utils_config", + ":private_securec_config", + ] public_configs = [ ":utils_config" ] part_name = "utils_base" install_images = [