From b07341e90f2eec70131e1d322595c93b276c41c2 Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 01:07:20 +0800 Subject: [PATCH 1/3] hiviewdfx_hilog: add lib to updater image Signed-off-by: sun_fan --- adapter/BUILD.gn | 2 ++ frameworks/native/BUILD.gn | 3 ++- interfaces/native/innerkits/BUILD.gn | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index 42638e3..8f7107f 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -31,4 +31,6 @@ ohos_shared_library("libhilog_os_adapter") { install_enable = true part_name = "hilog_native" subsystem_name = "hiviewdfx" + module_install_dir = "lib" + install_images = [ "system", "updater" ] } diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn index 25df7ce..3f8c21a 100644 --- a/frameworks/native/BUILD.gn +++ b/frameworks/native/BUILD.gn @@ -92,7 +92,8 @@ ohos_shared_library("libhilogutil") { output_extension = "so" install_enable = true - + module_install_dir = "lib" + install_images = [ "system", "updater" ] part_name = "hilog_native" subsystem_name = "hiviewdfx" } diff --git a/interfaces/native/innerkits/BUILD.gn b/interfaces/native/innerkits/BUILD.gn index 3f610d7..d4f206e 100644 --- a/interfaces/native/innerkits/BUILD.gn +++ b/interfaces/native/innerkits/BUILD.gn @@ -30,7 +30,8 @@ ohos_shared_library("libhilog") { output_extension = "so" install_enable = true - + module_install_dir = "lib" + install_images = [ "system", "updater" ] part_name = "hilog_native" subsystem_name = "hiviewdfx" } -- Gitee From 6ba6c9d04d3d1436ba37459ce1542a1d23def8b0 Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 19:28:05 +0800 Subject: [PATCH 2/3] hiviewdfx_hilog: remove module_install_dir Signed-off-by: sun_fan --- adapter/BUILD.gn | 1 - frameworks/native/BUILD.gn | 1 - interfaces/native/innerkits/BUILD.gn | 1 - 3 files changed, 3 deletions(-) diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index 8f7107f..8b9a4e3 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -31,6 +31,5 @@ ohos_shared_library("libhilog_os_adapter") { install_enable = true part_name = "hilog_native" subsystem_name = "hiviewdfx" - module_install_dir = "lib" install_images = [ "system", "updater" ] } diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn index 3f8c21a..7376b50 100644 --- a/frameworks/native/BUILD.gn +++ b/frameworks/native/BUILD.gn @@ -92,7 +92,6 @@ ohos_shared_library("libhilogutil") { output_extension = "so" install_enable = true - module_install_dir = "lib" install_images = [ "system", "updater" ] part_name = "hilog_native" subsystem_name = "hiviewdfx" diff --git a/interfaces/native/innerkits/BUILD.gn b/interfaces/native/innerkits/BUILD.gn index d4f206e..a59e164 100644 --- a/interfaces/native/innerkits/BUILD.gn +++ b/interfaces/native/innerkits/BUILD.gn @@ -30,7 +30,6 @@ ohos_shared_library("libhilog") { output_extension = "so" install_enable = true - module_install_dir = "lib" install_images = [ "system", "updater" ] part_name = "hilog_native" subsystem_name = "hiviewdfx" -- Gitee From 3036cef09f4340b48b850a567ad17bc8cdb78ea2 Mon Sep 17 00:00:00 2001 From: sun_fan Date: Wed, 4 Aug 2021 22:20:29 +0800 Subject: [PATCH 3/3] hilog: gn format Signed-off-by: sun_fan --- adapter/BUILD.gn | 9 +++++++-- frameworks/native/BUILD.gn | 14 ++++++-------- interfaces/native/innerkits/BUILD.gn | 5 ++++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index 8b9a4e3..6b170c0 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -19,7 +19,9 @@ ohos_shared_library("libhilog_os_adapter") { "socket_server_adapter.cpp", ] - deps = [ "//utils/native/base:utilsecurec_shared" ] + deps = [ + "//utils/native/base:utilsecurec_shared", + ] defines = [ "USING_EXISTING_SOCKET" ] @@ -31,5 +33,8 @@ ohos_shared_library("libhilog_os_adapter") { install_enable = true part_name = "hilog_native" subsystem_name = "hiviewdfx" - install_images = [ "system", "updater" ] + install_images = [ + "system", + "updater", + ] } diff --git a/frameworks/native/BUILD.gn b/frameworks/native/BUILD.gn index 7376b50..15774e2 100644 --- a/frameworks/native/BUILD.gn +++ b/frameworks/native/BUILD.gn @@ -57,9 +57,7 @@ config("libhilogutil_config") { ] if (use_musl) { - include_dirs += [ - "//base/startup/init_lite/interfaces/innerkits/include", - ] + include_dirs += [ "//base/startup/init_lite/interfaces/innerkits/include" ] } } @@ -84,15 +82,15 @@ ohos_shared_library("libhilogutil") { if (use_musl) { defines = [ "HILOG_USE_MUSL" ] - deps += [ - "//base/startup/init_lite/interfaces/innerkits/socket:libsocket", - ] + deps += [ "//base/startup/init_lite/interfaces/innerkits/socket:libsocket" ] } - output_extension = "so" install_enable = true - install_images = [ "system", "updater" ] + install_images = [ + "system", + "updater", + ] part_name = "hilog_native" subsystem_name = "hiviewdfx" } diff --git a/interfaces/native/innerkits/BUILD.gn b/interfaces/native/innerkits/BUILD.gn index a59e164..5b77331 100644 --- a/interfaces/native/innerkits/BUILD.gn +++ b/interfaces/native/innerkits/BUILD.gn @@ -30,7 +30,10 @@ ohos_shared_library("libhilog") { output_extension = "so" install_enable = true - install_images = [ "system", "updater" ] + install_images = [ + "system", + "updater", + ] part_name = "hilog_native" subsystem_name = "hiviewdfx" } -- Gitee