From 018bbb528df3beefee31b66a636c5c281a855b9b Mon Sep 17 00:00:00 2001 From: the-minions-of-cplu Date: Sat, 7 May 2022 17:35:57 +0800 Subject: [PATCH] change i18n's inner_apis to inner_api Signed-off-by: the-minions-of-cplu --- bundle.json | 4 ++-- frameworks/intl/BUILD.gn | 6 ++++-- frameworks/zone/BUILD.gn | 2 +- frameworks/zone/test/BUILD.gn | 2 +- interfaces/js/kits/BUILD.gn | 4 ++-- .../{inner_apis => inner_api}/i18n/include/locale_util.h | 0 .../preferred_language/include/preferred_language.h | 0 .../{inner_apis => inner_api}/zone/include/zone_util.h | 0 8 files changed, 10 insertions(+), 8 deletions(-) rename interfaces/native/{inner_apis => inner_api}/i18n/include/locale_util.h (100%) rename interfaces/native/{inner_apis => inner_api}/preferred_language/include/preferred_language.h (100%) rename interfaces/native/{inner_apis => inner_api}/zone/include/zone_util.h (100%) diff --git a/bundle.json b/bundle.json index 08e3c9a..cf15e18 100644 --- a/bundle.json +++ b/bundle.json @@ -77,7 +77,7 @@ "header_files": [ "zone_util.h" ], - "header_base": "//base/global/i18n/interfaces/native/inner_apis/zone/include" + "header_base": "//base/global/i18n/interfaces/native/inner_api/zone/include" } }, { @@ -96,7 +96,7 @@ "header_files": [ "preferred_language.h" ], - "header_base": "//base/global/i18n/interfaces/native/inner_apis/preferred_language/include" + "header_base": "//base/global/i18n/interfaces/native/inner_api/preferred_language/include" } } ], diff --git a/frameworks/intl/BUILD.gn b/frameworks/intl/BUILD.gn index 4bd7c23..81704b4 100644 --- a/frameworks/intl/BUILD.gn +++ b/frameworks/intl/BUILD.gn @@ -21,7 +21,9 @@ group("build_module") { } config("preferred_language_config") { - include_dirs = [ "//base/global/i18n/interfaces/native/inner_apis/preferred_language/include" ] + include_dirs = [ + "//base/global/i18n/interfaces/native/inner_api/preferred_language/include", + ] } ohos_shared_library("preferred_language") { public_configs = [ ":preferred_language_config" ] @@ -47,7 +49,7 @@ config("intl_util_config") { "//third_party/icu/icu4c/source/i18n", "//third_party/icu/icu4c/source/common/unicode", "//base/global/i18n/frameworks/intl/include", - "//base/global/i18n/interfaces/native/inner_apis/i18n/include", + "//base/global/i18n/interfaces/native/inner_api/i18n/include", ] } ohos_shared_library("intl_util") { diff --git a/frameworks/zone/BUILD.gn b/frameworks/zone/BUILD.gn index 8f1b7f7..1eb5800 100644 --- a/frameworks/zone/BUILD.gn +++ b/frameworks/zone/BUILD.gn @@ -19,7 +19,7 @@ config("zone_util_public_configs") { "//third_party/icu/icu4c/source/common", "//third_party/icu/icu4c/source/common/unicode", "//third_party/icu/icu4c/source/i18n", - "//base/global/i18n/interfaces/native/inner_apis/zone/include", + "//base/global/i18n/interfaces/native/inner_api/zone/include", "//third_party/libphonenumber/cpp/src", "//third_party/protobuf/src", "//third_party/protobuf/src/google", diff --git a/frameworks/zone/test/BUILD.gn b/frameworks/zone/test/BUILD.gn index 01dea60..2556a63 100644 --- a/frameworks/zone/test/BUILD.gn +++ b/frameworks/zone/test/BUILD.gn @@ -36,7 +36,7 @@ ohos_unittest("zone_util_test") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/googletest/googletest", - "//base/global/i18n/interfaces/native/inner_apis/zone/include", + "//base/global/i18n/interfaces/native/inner_api/zone/include", "//third_party/icu/icu4c/source/common/unicode", "//third_party/icu/icu4c/source/common", "//third_party/libphonenumber/cpp/src", diff --git a/interfaces/js/kits/BUILD.gn b/interfaces/js/kits/BUILD.gn index 7eebf82..7da8100 100644 --- a/interfaces/js/kits/BUILD.gn +++ b/interfaces/js/kits/BUILD.gn @@ -24,7 +24,7 @@ ohos_shared_library("intl") { include_dirs = [ "//base/global/i18n/frameworks/intl/include", "//base/global/i18n/interfaces/js/kits/include", - "//base/hiviewdfx/interfaces/native/inner_apis/include", + "//base/hiviewdfx/interfaces/native/inner_api/include", "//foundation/arkui/napi/native_engine", "//foundation/arkui/napi/interfaces/kits", "//third_party/node/src", @@ -55,7 +55,7 @@ ohos_shared_library("i18n") { include_dirs = [ "//base/global/i18n/frameworks/intl/include", "//base/global/i18n/interfaces/js/kits/include", - "//base/hiviewdfx/interfaces/native/inner_apis/include", + "//base/hiviewdfx/interfaces/native/inner_api/include", "//foundation/arkui/napi/native_engine", "//foundation/arkui/napi/interfaces/kits", "//third_party/node/src", diff --git a/interfaces/native/inner_apis/i18n/include/locale_util.h b/interfaces/native/inner_api/i18n/include/locale_util.h similarity index 100% rename from interfaces/native/inner_apis/i18n/include/locale_util.h rename to interfaces/native/inner_api/i18n/include/locale_util.h diff --git a/interfaces/native/inner_apis/preferred_language/include/preferred_language.h b/interfaces/native/inner_api/preferred_language/include/preferred_language.h similarity index 100% rename from interfaces/native/inner_apis/preferred_language/include/preferred_language.h rename to interfaces/native/inner_api/preferred_language/include/preferred_language.h diff --git a/interfaces/native/inner_apis/zone/include/zone_util.h b/interfaces/native/inner_api/zone/include/zone_util.h similarity index 100% rename from interfaces/native/inner_apis/zone/include/zone_util.h rename to interfaces/native/inner_api/zone/include/zone_util.h