From f65237ef0117ad305c5e68256430c09e11f40fba Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Wed, 2 Nov 2022 19:24:14 +0800 Subject: [PATCH] Descriptor: Modify for ark standalone build Details: Modify gn Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I5Z3PY Signed-off-by: wengchangcheng Change-Id: Ied9065386c4393ee3b7cfe0a923ea6e0151b0979 --- .gitignore | 3 ++- BUILD.gn | 1 - ets_frontend_config.gni | 1 + ts2panda/tests/BUILD.gn | 2 -- ts2panda/ts2abc_config.gni | 10 +--------- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4583ab1fb8..17f1e53ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ test262/data/ test262/eshost/ test262/harness/ -out/ \ No newline at end of file +test262/__pycache__/ +out/ diff --git a/BUILD.gn b/BUILD.gn index bbe7d8a453..b92dc779c8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//arkcompiler/runtime_core/ark_config.gni") -import("//build/ohos.gni") group("ets_frontend_build") { deps = [ diff --git a/ets_frontend_config.gni b/ets_frontend_config.gni index f09625004a..2aa02739e7 100644 --- a/ets_frontend_config.gni +++ b/ets_frontend_config.gni @@ -23,6 +23,7 @@ if (!ark_standalone_build) { ark_third_party_root = "//arkcompiler/toolchain/build/third_party_gn" import("$build_root/ark.gni") } +import("$build_root/test.gni") ets_frontend_root = "//arkcompiler/ets_frontend" diff --git a/ts2panda/tests/BUILD.gn b/ts2panda/tests/BUILD.gn index 57eaa7a17e..b18342c9c8 100644 --- a/ts2panda/tests/BUILD.gn +++ b/ts2panda/tests/BUILD.gn @@ -12,8 +12,6 @@ # limitations under the License. import("//arkcompiler/ets_frontend/ts2panda/ts2abc_config.gni") -import("//build/config/clang/clang.gni") -import("//build/ohos.gni") action("ts2abc_ts_type_system_test") { script = "${ts2abc_root}/../testTs/run_testTs.py" diff --git a/ts2panda/ts2abc_config.gni b/ts2panda/ts2abc_config.gni index b1c7f692eb..7551feda15 100755 --- a/ts2panda/ts2abc_config.gni +++ b/ts2panda/ts2abc_config.gni @@ -12,15 +12,7 @@ # limitations under the License. import("//arkcompiler/ets_frontend/ets_frontend_config.gni") -if (!ark_standalone_build) { - import("//build/ohos.gni") - import("//build/test.gni") - build_root = "//build" - ts2abc_root = "//arkcompiler/ets_frontend/ts2panda" -} else { - import("$build_root/ark.gni") - ts2abc_root = "//arkcompiler/ets_frontend/ts2panda" -} +ts2abc_root = "//arkcompiler/ets_frontend/ts2panda" declare_args() { nodejs_dir = "" -- Gitee