From 050f75f3c95a75ed7d4cc4317975633a15ca1a63 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 21 Mar 2024 07:48:54 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9abseil-cpp?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- bundle.json | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index 75b94e0..c655e91 100644 --- a/bundle.json +++ b/bundle.json @@ -23,7 +23,73 @@ }, "build": { "sub_component": [], - "inner_kits": [], + "inner_kits": [ + { + "name": "//third_party/abseil-cpp:absl_base", + "header": { + "header_files": [ + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/base" + } + }, + { + "name": "//third_party/abseil-cpp:absl_raw_logging_internal", + "header": { + "header_files": [ + "raw_logging.h" + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/base/internal" + } + }, + { + "name": "//third_party/abseil-cpp:absl_container", + "header": { + "header_files": [ + "raw_hash_set.h" + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/container/internal" + } + }, + { + "name": "//third_party/abseil-cpp:absl_str_format_internal", + "header": { + "header_files": [ + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/strings/internal/str_format" + } + }, + { + "name": "//third_party/abseil-cpp:absl_strings", + "header": { + "header_files": [ + "charconv_bigint.h", + "charconv_parse.h", + "memutil.h", + "stl_type_traits.h", + "str_join_internal.h", + "str_split_internal.h" + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/strings/internal" + } + }, + { + "name": "//third_party/abseil-cpp:absl_throw_delegate", + "header": { + "header_files": [ + "throw_delegate.h" + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/base/internal" + } + }, + { + "name": "//third_party/abseil-cpp:absl_time", + "header": { + "header_files": [ + ], + "header_base": "//third_party/abseil-cpp/abseil-cpp/absl/time" + } + } + ], "test": [] } } -- Gitee From 9776eb0c25292a0460312554d42e9ee2ede54599 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Thu, 21 Mar 2024 09:21:07 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=95=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9BUILD.gn=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- BUILD.gn | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9ff2d99..4092209 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -31,7 +31,7 @@ ohos_shared_library("absl_base") { cflags = ABSL_DEFAULT_COPTS - public_deps = [ + deps = [ ":absl_log_severity", ":absl_raw_logging_internal", ":absl_spinlock_wait", @@ -112,7 +112,7 @@ ohos_shared_library("absl_stacktrace") { ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ ":absl_base" ] + deps = [ ":absl_base" ] install_enable = true subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" @@ -130,7 +130,7 @@ ohos_shared_library("absl_symbolize") { ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ ":absl_base" ] + deps = [ ":absl_base" ] install_enable = true subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" @@ -149,7 +149,7 @@ ohos_shared_library("absl_hash") { ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ + deps = [ ":absl_base", ":absl_stacktrace", ":absl_symbolize", @@ -186,7 +186,7 @@ ohos_shared_library("absl_status") { cflags = ABSL_DEFAULT_COPTS #deps = [ "${ABSEIL_DIR}/absl/base:absl_raw_logging_internal" ] - public_deps = [ + deps = [ ":absl_cord", ":absl_raw_logging_internal", ":absl_strings", @@ -205,7 +205,7 @@ ohos_shared_library("absl_statusor") { cflags = ABSL_DEFAULT_COPTS - public_deps = [ + deps = [ ":absl_cord", ":absl_spinlock_wait", ":absl_status", @@ -299,7 +299,7 @@ ohos_shared_library("absl_strings") { include_dirs = [ "${ABSEIL_DIR}/" ] configs = [ ":cflags_config" ] - public_deps = [ + deps = [ ":absl_int128", ":absl_raw_logging_internal", ":absl_strings_internal", @@ -407,7 +407,7 @@ ohos_shared_library("absl_sync") { ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ + deps = [ ":absl_base", ":absl_stacktrace", ":absl_symbolize", @@ -430,7 +430,7 @@ ohos_shared_library("absl_container") { sources = [ "${ABSEIL_DIR}/absl/container/internal/raw_hash_set.cc" ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ ":absl_base" ] + deps = [ ":absl_base" ] install_enable = true subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" @@ -474,7 +474,7 @@ ohos_shared_library("absl_time") { ] include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS - public_deps = [ + deps = [ ":absl_base", ":absl_civil_time", ":absl_int128", -- Gitee