From e285fdde04e95c4f9d7062e5765e7a0edbcc6222 Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 00:52:35 +0800 Subject: [PATCH 1/3] utils_native: add lib to updater image Signed-off-by: sun_fan --- base/BUILD.gn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn index 303247e..0a2d894 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -111,6 +111,8 @@ ohos_shared_library("utils") { defines = [ "CONFIG_HILOG" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] part_name = "utils_base" + module_install_dir = "lib" + install_images = [ "system", "updater" ] } securec_sources = [ @@ -168,5 +170,7 @@ ohos_shared_library("utilsecurec_shared") { ":utils_config", ] part_name = "utils_base" + module_install_dir = "lib" + install_images = [ "system", "updater" ] } ############################################################################### -- Gitee From d632a7d3ff5ac002fe15dda80ab915e66b4a74bb Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 19:20:55 +0800 Subject: [PATCH 2/3] utils_native: remove module_install_dir Signed-off-by: sun_fan --- base/BUILD.gn | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index 0a2d894..dbadb1b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -111,7 +111,6 @@ ohos_shared_library("utils") { defines = [ "CONFIG_HILOG" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] part_name = "utils_base" - module_install_dir = "lib" install_images = [ "system", "updater" ] } @@ -170,7 +169,6 @@ ohos_shared_library("utilsecurec_shared") { ":utils_config", ] part_name = "utils_base" - module_install_dir = "lib" install_images = [ "system", "updater" ] } ############################################################################### -- Gitee From c83a17acdf387eb00596a551600eeb3c63940b4b Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 22:15:13 +0800 Subject: [PATCH 3/3] utils_native : gn format Signed-off-by: sun_fan --- base/BUILD.gn | 95 ++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn index dbadb1b..97f33ac 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") - ############################################################################### config("utils_config") { visibility = [ ":*" ] @@ -111,50 +110,53 @@ ohos_shared_library("utils") { defines = [ "CONFIG_HILOG" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] part_name = "utils_base" - install_images = [ "system", "updater" ] + install_images = [ + "system", + "updater", + ] } 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/vsprintf_s.c", - "src/securec/vsscanf_s.c", - "src/securec/vswprintf_s.c", - "src/securec/vsnprintf_s_p.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", + "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/vsprintf_s.c", + "src/securec/vsscanf_s.c", + "src/securec/vswprintf_s.c", + "src/securec/vsnprintf_s_p.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") { @@ -165,10 +167,11 @@ ohos_static_library("utilsecurec") { ohos_shared_library("utilsecurec_shared") { sources = securec_sources configs = [ ":utils_config" ] - public_configs = [ - ":utils_config", - ] + public_configs = [ ":utils_config" ] part_name = "utils_base" - install_images = [ "system", "updater" ] + install_images = [ + "system", + "updater", + ] } ############################################################################### -- Gitee