68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
From d0d35591b378d879f1659f4bfd082b165b31e8f1 Mon Sep 17 00:00:00 2001
|
|
From: tian2020 <tian_hang@hoperun.com>
|
|
Date: Wed, 14 Jun 2023 19:55:41 +0800
|
|
Subject: [PATCH 2/3] fix build gn files config
|
|
|
|
---
|
|
interfaces/native/innerkits/BUILD.gn | 34 +++++++++++++++++++++-------
|
|
1 file changed, 26 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/interfaces/native/innerkits/BUILD.gn b/interfaces/native/innerkits/BUILD.gn
|
|
index ee27551..c74beda 100644
|
|
--- a/interfaces/native/innerkits/BUILD.gn
|
|
+++ b/interfaces/native/innerkits/BUILD.gn
|
|
@@ -22,16 +22,16 @@ config("libhilog_pub_config") {
|
|
ohos_shared_library("libhilog") {
|
|
public_configs = [ ":libhilog_pub_config" ]
|
|
sources = [
|
|
- "//base/hiviewdfx/hilog/libhilog/hilog.cpp",
|
|
- "//base/hiviewdfx/hilog/libhilog/vsnprintf/vsnprintf_s_p.cpp",
|
|
- "//base/hiviewdfx/hilog/libhilog/utils/log_utils.cpp",
|
|
- "//base/hiviewdfx/hilog/libhilog/utils/log_print.cpp",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/hilog.cpp",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/vsnprintf/vsnprintf_s_p.cpp",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/utils/log_utils.cpp",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/utils/log_print.cpp",
|
|
]
|
|
|
|
include_dirs = [
|
|
- "//base/hiviewdfx/hilog/libhilog/include/",
|
|
- "//base/hiviewdfx/hilog/libhilog/vsnprintf/include/",
|
|
- "//base/hiviewdfx/hilog/libhilog/utils/include/",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/include/",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/vsnprintf/include/",
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/utils/include/",
|
|
]
|
|
|
|
defines = []
|
|
@@ -56,7 +56,25 @@ config("libhilog_base_pub_cfg") {
|
|
ohos_static_library("libhilog_base") {
|
|
public_configs = [ ":libhilog_base_pub_cfg" ]
|
|
|
|
- deps = [ "//base/hiviewdfx/hilog/frameworks/libhilog:libhilog_base_source" ]
|
|
+ #deps = [ "//base/hiviewdfx/hilog/frameworks/libhilog:libhilog_base_source" ]
|
|
+
|
|
+ include_dirs = [
|
|
+ "//base/hiviewdfx/hilog/frameworks/libhilog/vsnprintf/include",
|
|
+ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
|
|
+ ]
|
|
+
|
|
+ # vsnprintf_sources = [ "$vsnprintf_root/vsnprintf_s_p.cpp" ]
|
|
+
|
|
+ sources = [ "//base/hiviewdfx/hilog/frameworks/libhilog/base/hilog_base.cpp" ]
|
|
+ # sources += vsnprintf_sources
|
|
+
|
|
+ public_configs += [ "//base/hiviewdfx/hilog/frameworks/libhilog/:libhilog_base_config" ]
|
|
+ configs = [ "//base/hiviewdfx/hilog/frameworks/libhilog/:libhilog_base_config" ]
|
|
+
|
|
+ defines = [
|
|
+ "__RECV_MSG_WITH_UCRED_",
|
|
+ "HILOG_PROHIBIT_ALLOCATION",
|
|
+ ]
|
|
|
|
subsystem_name = "hiviewdfx"
|
|
part_name = "hilog_native"
|
|
--
|
|
2.33.0
|
|
|