From eb7b393e63c7717035d93907f36ee3c99581b100 Mon Sep 17 00:00:00 2001 From: wenlong_12 Date: Mon, 12 Jun 2023 09:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20abseil=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=95=B4=E6=94=B9=20=20=20=20=20=20Signed-of?= =?UTF-8?q?f-by:=20wenlong=5F12=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wenlong_12 --- BUILD.gn | 87 +++++++++++++++++++++++---------------------- configure_copts.gni | 3 +- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 1080a88..2b8050f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//developtools/profiler/build/config.gni") import("./configure_copts.gni") libabseil_path = rebase_path("//third_party/abseil-cpp") @@ -38,8 +37,8 @@ ohos_shared_library("absl_base") { ":absl_spinlock_wait", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_raw_logging_internal") { @@ -51,8 +50,8 @@ ohos_shared_library("absl_raw_logging_internal") { deps = [ ":absl_log_severity" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_log_severity") { @@ -61,8 +60,8 @@ ohos_shared_library("absl_log_severity") { cflags = ABSL_DEFAULT_COPTS install_enable = true innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_spinlock_wait") { @@ -76,8 +75,8 @@ ohos_shared_library("absl_spinlock_wait") { include_dirs = [ "${ABSEIL_DIR}/" ] cflags = ABSL_DEFAULT_COPTS install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_throw_delegate") { @@ -89,8 +88,8 @@ ohos_shared_library("absl_throw_delegate") { deps = [ ":absl_raw_logging_internal" ] install_enable = true innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_stacktrace") { @@ -114,8 +113,8 @@ ohos_shared_library("absl_stacktrace") { cflags = ABSL_DEFAULT_COPTS public_deps = [ ":absl_base" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_symbolize") { @@ -132,8 +131,8 @@ ohos_shared_library("absl_symbolize") { cflags = ABSL_DEFAULT_COPTS public_deps = [ ":absl_base" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_hash") { @@ -156,8 +155,8 @@ ohos_shared_library("absl_hash") { ":absl_time", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_int128") { @@ -170,8 +169,8 @@ ohos_shared_library("absl_int128") { cflags = ABSL_DEFAULT_COPTS install_enable = true innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_status") { @@ -194,8 +193,8 @@ ohos_shared_library("absl_status") { install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_statusor") { @@ -213,8 +212,8 @@ ohos_shared_library("absl_statusor") { install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } config("cflags_config") { @@ -306,8 +305,8 @@ ohos_shared_library("absl_strings") { ] install_enable = true innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_strings_internal") { @@ -325,8 +324,8 @@ ohos_shared_library("absl_strings_internal") { ] install_enable = true innerapi_tags = [ "platformsdk_indirect" ] - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_cord") { @@ -359,8 +358,8 @@ ohos_shared_library("absl_cord") { ":absl_time", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_str_format_internal") { @@ -381,8 +380,8 @@ ohos_shared_library("absl_str_format_internal") { ":absl_strings", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_sync") { @@ -412,16 +411,16 @@ ohos_shared_library("absl_sync") { ":absl_time", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_civil_time") { sources = [ "${ABSEIL_DIR}/absl/time/internal/cctz/src/civil_time_detail.cc" ] include_dirs = [ "${ABSEIL_DIR}/" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_container") { @@ -430,8 +429,8 @@ ohos_shared_library("absl_container") { cflags = ABSL_DEFAULT_COPTS public_deps = [ ":absl_base" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_time_zone") { @@ -456,8 +455,8 @@ ohos_shared_library("absl_time_zone") { include_dirs = [ "${ABSEIL_DIR}/" ] deps = [ ":absl_civil_time" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_time") { @@ -481,8 +480,8 @@ ohos_shared_library("absl_time") { ":absl_time_zone", ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - part_name = "${OHOS_PROFILER_PART_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_bad_optional_access") { @@ -491,7 +490,8 @@ ohos_shared_library("absl_bad_optional_access") { cflags = ABSL_DEFAULT_COPTS deps = [ ":absl_raw_logging_internal" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } ohos_shared_library("absl_bad_variant_access") { @@ -500,5 +500,6 @@ ohos_shared_library("absl_bad_variant_access") { cflags = ABSL_DEFAULT_COPTS deps = [ ":absl_raw_logging_internal" ] install_enable = true - subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" + subsystem_name = "${THIRDPARTY_ABSEIL_SUBSYS_NAME}" + part_name = "${THIRDPARTY_ABSEIL_PART_NAME}" } diff --git a/configure_copts.gni b/configure_copts.gni index 6fb2330..e082329 100644 --- a/configure_copts.gni +++ b/configure_copts.gni @@ -12,7 +12,8 @@ # limitations under the License. ABSEIL_DIR = get_path_info("./abseil-cpp/", "abspath") - +THIRDPARTY_ABSEIL_SUBSYS_NAME = "thirdparty" +THIRDPARTY_ABSEIL_PART_NAME = "abseil_cpp" ABSL_DEFAULT_COPTS = [ "-Wall", "-Wextra", -- Gitee