mirror of
https://gitee.com/openharmony/global_i18n
synced 2024-11-23 15:10:32 +00:00
Changes to be committed:
modified: bundle.json modified: frameworks/intl/BUILD.gn modified: src/phone_number_format.cpp Signed-off-by: mengjingzhimo <luoboming@huawei.com>
This commit is contained in:
parent
b96ac8f311
commit
247b979335
@ -71,7 +71,8 @@
|
|||||||
"sub_component": [
|
"sub_component": [
|
||||||
"//base/global/i18n/frameworks/zone:zone_util",
|
"//base/global/i18n/frameworks/zone:zone_util",
|
||||||
"//base/global/i18n/frameworks/intl:build_module",
|
"//base/global/i18n/frameworks/intl:build_module",
|
||||||
"//base/global/i18n/interfaces/js/kits:build_module"
|
"//base/global/i18n/interfaces/js/kits:build_module",
|
||||||
|
"//base/global/i18n/frameworks/intl:geocoding_depends"
|
||||||
],
|
],
|
||||||
"inner_kits": [
|
"inner_kits": [
|
||||||
{
|
{
|
||||||
|
@ -20,6 +20,12 @@ group("build_module") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
group("geocoding_depends") {
|
||||||
|
deps = [
|
||||||
|
"//third_party/libphonenumber/cpp:geocoding"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
config("preferred_language_config") {
|
config("preferred_language_config") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"//base/global/i18n/interfaces/native/inner_api/preferred_language/include",
|
"//base/global/i18n/interfaces/native/inner_api/preferred_language/include",
|
||||||
@ -98,7 +104,7 @@ ohos_shared_library("intl_util") {
|
|||||||
"//third_party/icu/icu4c:ohos_icudat",
|
"//third_party/icu/icu4c:ohos_icudat",
|
||||||
"//third_party/icu/icu4c:shared_icui18n",
|
"//third_party/icu/icu4c:shared_icui18n",
|
||||||
"//third_party/icu/icu4c:shared_icuuc",
|
"//third_party/icu/icu4c:shared_icuuc",
|
||||||
"//third_party/libphonenumber/cpp:build_module",
|
"//third_party/libphonenumber/cpp:phonenumber_standard",
|
||||||
"//third_party/libxml2:xml2",
|
"//third_party/libxml2:xml2",
|
||||||
]
|
]
|
||||||
external_deps = [
|
external_deps = [
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include "locid.h"
|
#include "locid.h"
|
||||||
#include "phone_number_format.h"
|
#include "phone_number_format.h"
|
||||||
/**#include "cpp/src/phonenumbers/geocoding/geocoding_warpper.h"*/
|
|
||||||
|
|
||||||
namespace OHOS {
|
namespace OHOS {
|
||||||
namespace Global {
|
namespace Global {
|
||||||
@ -56,6 +55,8 @@ PhoneNumberFormat::~PhoneNumberFormat()
|
|||||||
{
|
{
|
||||||
if (dynamic_handler != NULL) {
|
if (dynamic_handler != NULL) {
|
||||||
dlclose(dynamic_handler);
|
dlclose(dynamic_handler);
|
||||||
|
dynamic_handler = nullptr;
|
||||||
|
func = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user