diff --git a/bundle.json b/bundle.json index f07500d1e4121e3ada0989a4b4024c51039dc970..225dc7f08ca1a40626eac79d60f4f6c421636309 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 c9d14265e371fc630b6cd76f6eb76e3c94be39b8..8621ac8be66b90efa20b462b17643da033c3e841 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 ab9fe10bd2b7feb5625b3f2538c880087afb25a4..9d566a8a722b2502e50a727eb8ffdf4a263ab81b 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", ] }