From f02dc835acefa1903181d0fdd53289f0058bef6d Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 10:17:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- cpp/BUILD.gn | 33 +++++++++++++-------------------- cpp/test/BUILD.gn | 8 -------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn index 34cd506..fdd7b0d 100644 --- a/cpp/BUILD.gn +++ b/cpp/BUILD.gn @@ -20,17 +20,7 @@ group("build_module") { ] } config("phonenumber_config") { - include_dirs = [ - "//third_party/abseil-cpp/abseil-cpp", - "//third_party/bounds_checking_function/include", - "//third_party/icu/icu4c/source/common", - "//third_party/icu/icu4c/source/i18n", - "//third_party/icu/icu4c/source", - "//third_party/libphonenumber/cpp/src", - "//third_party/protobuf/src", - "//third_party/protobuf/src/google", - "//third_party/protobuf/src/google/protobuf", - ] + include_dirs = [ "//third_party/libphonenumber/cpp/src" ] cflags = [ "-Wno-implicit-fallthrough" ] cflags_cc = [ "-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS", @@ -80,13 +70,7 @@ phonenumber_source = [ "src/phonenumbers/utf/rune.c", ] -phonenumber_deps = [ - "//third_party/abseil-cpp:absl_base", - "//third_party/abseil-cpp:absl_strings", - "//third_party/bounds_checking_function:libsec_shared", - "//third_party/icu/icu4c:shared_icui18n", - "//third_party/icu/icu4c:shared_icuuc", -] +phonenumber_deps = [] phonenumber_defines = [ "I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS", @@ -129,6 +113,13 @@ ohos_shared_library("phonenumber_standard") { sources = phonenumber_source deps = phonenumber_deps public_external_deps = [ "protobuf:protobuf_lite" ] + external_deps = [ + "abseil-cpp:absl_base", + "abseil-cpp:absl_strings", + "bounds_checking_function:libsec_shared", + "icu:shared_icui18n", + "icu:shared_icuuc", + ] defines = phonenumber_defines innerapi_tags = [ "platformsdk_indirect" ] part_name = "libphonenumber" @@ -149,10 +140,12 @@ ohos_shared_library("geocoding") { "src/phonenumbers/phonenumber.pb.h", ] deps = [ - "//third_party/bounds_checking_function:libsec_shared", - "//third_party/icu/icu4c:shared_icuuc", "//third_party/libphonenumber/cpp:phonenumber_standard", ] + external_deps = [ + "bounds_checking_function:libsec_shared", + "icu:shared_icuuc", + ] defines = geocoding_defines part_name = "libphonenumber" relative_install_dir = "platformsdk" diff --git a/cpp/test/BUILD.gn b/cpp/test/BUILD.gn index c7034a0..ac2d9b8 100644 --- a/cpp/test/BUILD.gn +++ b/cpp/test/BUILD.gn @@ -19,14 +19,6 @@ config("phonenumber_test_config") { include_dirs = [ "//third_party/libphonenumber/cpp/test", "//third_party/libphonenumber/cpp/src", - "//third_party/googletest/googletest/include", - "//third_party/googletest/googletest", - "//third_party/protobuf/src", - "//third_party/icu/icu4c/source", - "//third_party/icu/icu4c/source/common", - "//third_party/icu/icu4c/source/i18n", - "//third_party/protobuf/src/google", - "//third_party/protobuf/src/google/protobuf", ] cflags_cc = [ "-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS", -- Gitee From a2682a11f971daf40274c7fe4a09bfca9b9a5894 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 10:30:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- cpp/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn index fdd7b0d..cefaee7 100644 --- a/cpp/BUILD.gn +++ b/cpp/BUILD.gn @@ -139,9 +139,7 @@ ohos_shared_library("geocoding") { "src/phonenumbers/geocoding/phonenumber_offline_geocoder.cc", "src/phonenumbers/phonenumber.pb.h", ] - deps = [ - "//third_party/libphonenumber/cpp:phonenumber_standard", - ] + deps = [ "//third_party/libphonenumber/cpp:phonenumber_standard" ] external_deps = [ "bounds_checking_function:libsec_shared", "icu:shared_icuuc", -- Gitee From 52e6b181f5d938711806631999e060ce299f6065 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 11:04:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- bundle.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index f58d1ce..ea93c01 100644 --- a/bundle.json +++ b/bundle.json @@ -19,13 +19,12 @@ "ram": "", "deps": { "components": [ - "protobuf" - ], - "third_party": [ "abseil-cpp", "bounds_checking_function", - "icu" - ] + "icu", + "protobuf" + ], + "third_party": [] }, "build": { "sub_component": [ -- Gitee From 3968f78e17d2e7d2ade9f3f35d1df8cc08e9b656 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 11:16:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- bundle.json | 9 +++++---- cpp/BUILD.gn | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index ea93c01..f58d1ce 100644 --- a/bundle.json +++ b/bundle.json @@ -19,12 +19,13 @@ "ram": "", "deps": { "components": [ - "abseil-cpp", - "bounds_checking_function", - "icu", "protobuf" ], - "third_party": [] + "third_party": [ + "abseil-cpp", + "bounds_checking_function", + "icu" + ] }, "build": { "sub_component": [ diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn index cefaee7..20a5a05 100644 --- a/cpp/BUILD.gn +++ b/cpp/BUILD.gn @@ -114,8 +114,8 @@ ohos_shared_library("phonenumber_standard") { deps = phonenumber_deps public_external_deps = [ "protobuf:protobuf_lite" ] external_deps = [ - "abseil-cpp:absl_base", "abseil-cpp:absl_strings", + "abseil-cpp:absl_time", "bounds_checking_function:libsec_shared", "icu:shared_icui18n", "icu:shared_icuuc", -- Gitee From 4cbae906f3025c1ac4cff152064460a4a7cc88a6 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 14:57:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- bundle.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index f58d1ce..ea93c01 100644 --- a/bundle.json +++ b/bundle.json @@ -19,13 +19,12 @@ "ram": "", "deps": { "components": [ - "protobuf" - ], - "third_party": [ "abseil-cpp", "bounds_checking_function", - "icu" - ] + "icu", + "protobuf" + ], + "third_party": [] }, "build": { "sub_component": [ -- Gitee From 3c510e9c1c4a5419f27f797513f49696ede31d17 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 17:02:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- cpp/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn index 20a5a05..e023676 100644 --- a/cpp/BUILD.gn +++ b/cpp/BUILD.gn @@ -20,7 +20,10 @@ group("build_module") { ] } config("phonenumber_config") { - include_dirs = [ "//third_party/libphonenumber/cpp/src" ] + include_dirs = [ + "//third_party/abseil-cpp/abseil-cpp", + "//third_party/libphonenumber/cpp/src", + ] cflags = [ "-Wno-implicit-fallthrough" ] cflags_cc = [ "-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS", -- Gitee From 3c7bfb9d36e19b317afa930b8d9a497704bd24fb Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Tue, 19 Nov 2024 20:09:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- bundle.json | 9 +++++---- cpp/BUILD.gn | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/bundle.json b/bundle.json index ea93c01..f58d1ce 100644 --- a/bundle.json +++ b/bundle.json @@ -19,12 +19,13 @@ "ram": "", "deps": { "components": [ - "abseil-cpp", - "bounds_checking_function", - "icu", "protobuf" ], - "third_party": [] + "third_party": [ + "abseil-cpp", + "bounds_checking_function", + "icu" + ] }, "build": { "sub_component": [ diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn index e023676..34cd506 100644 --- a/cpp/BUILD.gn +++ b/cpp/BUILD.gn @@ -22,7 +22,14 @@ group("build_module") { config("phonenumber_config") { include_dirs = [ "//third_party/abseil-cpp/abseil-cpp", + "//third_party/bounds_checking_function/include", + "//third_party/icu/icu4c/source/common", + "//third_party/icu/icu4c/source/i18n", + "//third_party/icu/icu4c/source", "//third_party/libphonenumber/cpp/src", + "//third_party/protobuf/src", + "//third_party/protobuf/src/google", + "//third_party/protobuf/src/google/protobuf", ] cflags = [ "-Wno-implicit-fallthrough" ] cflags_cc = [ @@ -73,7 +80,13 @@ phonenumber_source = [ "src/phonenumbers/utf/rune.c", ] -phonenumber_deps = [] +phonenumber_deps = [ + "//third_party/abseil-cpp:absl_base", + "//third_party/abseil-cpp:absl_strings", + "//third_party/bounds_checking_function:libsec_shared", + "//third_party/icu/icu4c:shared_icui18n", + "//third_party/icu/icu4c:shared_icuuc", +] phonenumber_defines = [ "I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS", @@ -116,13 +129,6 @@ ohos_shared_library("phonenumber_standard") { sources = phonenumber_source deps = phonenumber_deps public_external_deps = [ "protobuf:protobuf_lite" ] - external_deps = [ - "abseil-cpp:absl_strings", - "abseil-cpp:absl_time", - "bounds_checking_function:libsec_shared", - "icu:shared_icui18n", - "icu:shared_icuuc", - ] defines = phonenumber_defines innerapi_tags = [ "platformsdk_indirect" ] part_name = "libphonenumber" @@ -142,10 +148,10 @@ ohos_shared_library("geocoding") { "src/phonenumbers/geocoding/phonenumber_offline_geocoder.cc", "src/phonenumbers/phonenumber.pb.h", ] - deps = [ "//third_party/libphonenumber/cpp:phonenumber_standard" ] - external_deps = [ - "bounds_checking_function:libsec_shared", - "icu:shared_icuuc", + deps = [ + "//third_party/bounds_checking_function:libsec_shared", + "//third_party/icu/icu4c:shared_icuuc", + "//third_party/libphonenumber/cpp:phonenumber_standard", ] defines = geocoding_defines part_name = "libphonenumber" -- Gitee