From b647a3fc747139034a66e42c7b2f163aa0534a3d Mon Sep 17 00:00:00 2001
From: the-minions-of-cplu <jinqi2@huawei.com>
Date: Thu, 14 Apr 2022 15:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9libphonenumber=E4=B8=BA?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=83=A8=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: the-minions-of-cplu <jinqi2@huawei.com>
---
 bundle.json       | 67 ++++++++++++++++++++++++++---------------------
 cpp/BUILD.gn      |  4 +--
 cpp/test/BUILD.gn |  3 +--
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/bundle.json b/bundle.json
index f07500d..225dc7f 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,30 +1,37 @@
-{
-    "name": "@ohos/libphonenumber",
-    "description": "Third-party open-source software libphonenumber | Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
-    "version": "3.1",
-    "license": "Apache V2",
-    "publishAs": "code-segment",
-    "segment": {
-        "destPath": "third_party/libphonenumber"
-    },
-    "dirs": {},
-    "scripts": {},
-    "component": {
-        "name": "thirdparty_libphonenumber",
-        "subsystem": "",
-        "syscap": [],
-        "features": [],
-        "adapted_system_type": [],
-        "rom": "",
-        "ram": "",
-        "deps": {
-            "components": [],
-            "third_party": []
-        },
-        "build": {
-            "sub_component": [],
-            "inner_kits": [],
-            "test": []
-        }
-    }
-}
\ No newline at end of file
+{
+    "name": "@ohos/libphonenumber",
+    "description": "Third-party open-source software libphonenumber | Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
+    "version": "3.1",
+    "license": "Apache License V2.0",
+    "publishAs": "code-segment",
+    "segment": {
+        "destPath": "third_party/libphonenumber"
+    },
+    "dirs": [],
+    "scripts": {},
+    "component": {
+        "name": "libphonenumber",
+        "subsystem": "thirdparty",
+        "syscap": [],
+        "features": [],
+        "adapted_system_type": [ "standard" ],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [],
+            "third_party": [
+                "icu",
+                "protobuf"
+            ]
+        },
+        "build": {
+            "sub_component": [
+                "//third_party/libphonenumber/cpp:phonenumber_standard"
+            ],
+            "inner_kits": [],
+            "test": [
+                "//third_party/libphonenumber/cpp/test:libphonenumber_test"
+            ]
+        }
+    }
+}
diff --git a/cpp/BUILD.gn b/cpp/BUILD.gn
index c9d1426..8621ac8 100644
--- a/cpp/BUILD.gn
+++ b/cpp/BUILD.gn
@@ -81,8 +81,8 @@ ohos_shared_library("phonenumber_standard") {
     "I18N_PHONENUMBERS_USE_ICU_REGEXP",
     "HAVE_PTHREAD",
   ]
-  part_name = "common"
-  subsystem_name = "common"
+  part_name = "libphonenumber"
+  subsystem_name = "thirdparty"
   remove_configs = [ "//build/config/compiler:no_rtti" ]
   ldflags = [ "-shared" ]
   install_enable = true
diff --git a/cpp/test/BUILD.gn b/cpp/test/BUILD.gn
index ab9fe10..9d566a8 100644
--- a/cpp/test/BUILD.gn
+++ b/cpp/test/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/test.gni")
 
-module_output_path = "i18n/libphonenumber_test"
+module_output_path = "libphonenumber/libphonenumber_test"
 
 config("phonenumber_test_config") {
   include_dirs = [
@@ -105,6 +105,5 @@ ohos_unittest("libphonenumber_test") {
     "//third_party/icu/icu4c:shared_icui18n",
     "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/protobuf/src:protobuf_standard",
-    "//utils/native/base:utils",
   ]
 }
-- 
Gitee