From a5585f6a8b016b0974a7eb894b49b0658ed00bd0 Mon Sep 17 00:00:00 2001 From: zhangdd_ewan Date: Wed, 18 Jun 2025 15:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E7=BC=96=E8=AF=91=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangdd_ewan --- frameworks/i18n/BUILD.gn | 19 +++++++------------ frameworks/i18n/test/BUILD.gn | 6 +++--- interfaces/kits/BUILD.gn | 2 +- interfaces/kits/js/builtin/BUILD.gn | 2 +- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/frameworks/i18n/BUILD.gn b/frameworks/i18n/BUILD.gn index b995e9e..6d9cd2a 100644 --- a/frameworks/i18n/BUILD.gn +++ b/frameworks/i18n/BUILD.gn @@ -38,9 +38,8 @@ locale_sources = [ config("locale_config") { include_dirs = [ - "//base/global/i18n_lite/interfaces/kits/i18n/include", - "//base/global/i18n_lite/frameworks/i18n/include", - "//third_party/bounds_checking_function/include", + "../../interfaces/kits/i18n/include", + "include", ] } @@ -54,27 +53,23 @@ if (defined(ohos_lite)) { static_library("global_i18n") { sources = locale_sources public_configs = [ ":locale_config" ] - deps = [ - ":global_dat", - "//third_party/bounds_checking_function:libsec_static", - ] + deps = [ ":global_dat" ] + external_deps = [ "bounds_checking_function:libsec_static" ] if (i18n_lite_support_i18n_product) { include_dirs = [ "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", "//commonlibrary/utils_lite/memory/include", ] defines = [ "I18N_PRODUCT" ] - deps += [ "//commonlibrary/utils_lite:utils" ] + external_deps += [ "utils_lite:utils" ] } } } else { shared_library("global_i18n") { sources = locale_sources public_configs = [ ":locale_config" ] - deps = [ - ":global_dat", - "//third_party/bounds_checking_function:libsec_shared", - ] + deps = [ ":global_dat" ] + external_deps = [ "bounds_checking_function:libsec_shared" ] } } diff --git a/frameworks/i18n/test/BUILD.gn b/frameworks/i18n/test/BUILD.gn index dfdc831..66cd322 100644 --- a/frameworks/i18n/test/BUILD.gn +++ b/frameworks/i18n/test/BUILD.gn @@ -21,11 +21,11 @@ if (ohos_kernel_type != "liteos_m") { sources = [ "unittest/lite/common/i18n_test.cpp" ] include_dirs = [ - "//base/global/i18n_lite/interfaces/kits/i18n/include", - "//base/global/i18n_lite/frameworks/i18n/test/unittest/lite/common", + "../../../interfaces/kits/i18n/include", + "unittest/lite/common", ] - deps = [ "//base/global/i18n_lite/frameworks/i18n:global_i18n" ] + deps = [ "../../../frameworks/i18n:global_i18n" ] output_dir = "$root_out_dir/test/unittest/global" } diff --git a/interfaces/kits/BUILD.gn b/interfaces/kits/BUILD.gn index b5ca041..bb914d9 100644 --- a/interfaces/kits/BUILD.gn +++ b/interfaces/kits/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") ohos_prebuilt_etc("i18n_dat") { - source = "//base/global/i18n_lite/frameworks/i18n/i18n.dat" + source = "../../frameworks/i18n/i18n.dat" module_install_dir = "system/i18n" part_name = "i18n_lite" subsystem_name = "global" diff --git a/interfaces/kits/js/builtin/BUILD.gn b/interfaces/kits/js/builtin/BUILD.gn index 0342427..3b4c78b 100644 --- a/interfaces/kits/js/builtin/BUILD.gn +++ b/interfaces/kits/js/builtin/BUILD.gn @@ -40,7 +40,7 @@ ohos_static_library("nativeapi_locale_simulator") { "//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/jsi", "//commonlibrary/utils_lite/include", ] - deps = [ "//third_party/bounds_checking_function:libsec_static" ] + external_deps = [ "bounds_checking_function:libsec_static" ] configs = [ ":nativeapi_locale_simulator_config" ] } -- Gitee