From 3e6da4ed2f325f38327a3641ca109198467a6e62 Mon Sep 17 00:00:00 2001
From: wengchangcheng <wengchangcheng@huawei.com>
Date: Mon, 16 Jun 2025 19:19:23 +0800
Subject: [PATCH] modify build root

Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICF9E3

Signed-off-by: wengchangcheng <wengchangcheng@huawei.com>
Change-Id: Ic2a780c470f6b123538f94710726941ece8700bd
---
 test/test_helper.gni  |  2 +-
 toolchain_config.gni  | 22 +++++-----------------
 tooling/test/BUILD.gn |  1 +
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/test/test_helper.gni b/test/test_helper.gni
index 1ce69656..408f1180 100644
--- a/test/test_helper.gni
+++ b/test/test_helper.gni
@@ -15,7 +15,7 @@ import("//arkcompiler/toolchain/toolchain.gni")
 import("$build_root/config/components/ets_frontend/es2abc_config.gni")
 import("$build_root/test.gni")
 
-if (is_standard_system || ark_standalone_build) {
+if (is_standard_system) {
   _icu_path_ = "thirdparty/icu"
 } else {
   _icu_path_ = "global/i18n"
diff --git a/toolchain_config.gni b/toolchain_config.gni
index 3065af5a..b0323626 100644
--- a/toolchain_config.gni
+++ b/toolchain_config.gni
@@ -11,6 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build/config/components/toolchain/build_type.gni")
+import("//build/ohos.gni")
+
 if (!defined(ark_standalone_build)) {
   ark_standalone_build = false
 }
@@ -27,16 +30,8 @@ if (defined(enable_cmc_gc) && !toolchain_enable_cmc_gc) {
   toolchain_enable_cmc_gc = enable_cmc_gc
 }
 
-if (!ark_standalone_build) {
-  build_root = "//build"
-  ark_third_party_root = "//third_party"
-  import("$build_root/config/components/toolchain/build_type.gni")
-  import("$build_root/ohos.gni")
-} else {
-  ark_third_party_root = "//build/third_party_gn"
-  import("$build_root/ark.gni")
-  import("$build_root/config/build_type.gni")
-}
+ark_third_party_root = "//third_party"
+build_root = "//build"
 ark_root = "//arkcompiler/runtime_core"
 js_root = "//arkcompiler/ets_runtime"
 global_root = "//base/global/i18n"
@@ -58,13 +53,6 @@ asan_lib_path = "/usr/lib/llvm-10/lib/clang/10.0.0/lib/linux"
 
 # under /system/lib64 dir
 arkcompiler_relative_lib_path = "module/arkcompiler"
-if (is_standard_system || ark_standalone_build) {
-  icu_part_name = "icu"
-  icu_subsystem_name = "thirdparty"
-} else {
-  icu_part_name = "i18n"
-  icu_subsystem_name = "global"
-}
 
 if (defined(is_arkui_x) && is_arkui_x && target_os == "ios") {
   sdk_libc_secshared_dep = "bounds_checking_function:libsec_static"
diff --git a/tooling/test/BUILD.gn b/tooling/test/BUILD.gn
index 59bde090..125cbf83 100644
--- a/tooling/test/BUILD.gn
+++ b/tooling/test/BUILD.gn
@@ -225,6 +225,7 @@ host_unittest_action("DebuggerTest") {
 
   # hiviewdfx libraries
   external_deps = hiviewdfx_ext_deps
+
   # libuv should be before libark_jsruntime
   # because there are libuv weak symbols in libark_jsruntime
   # and libuv should be loaded before their resolution
-- 
Gitee