diff --git a/.gitignore b/.gitignore index 4583ab1fb895357de1462bbd5a36ddc035661c25..17f1e53ff5b411bb847594df8b69aeb82948058d 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 bbe7d8a4534cc0ece4d6b4e00e9623ff48635c49..b92dc779c873c0313eb7df11b47e4625c2a46e34 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 f09625004a3d91ce3e8ab116903a09956532fd6a..2aa02739e73d6fb6aa3b927a73e13f517a50aa40 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 57eaa7a17ea6da850a4a3ab1f470d23668b59358..b18342c9c8d68394dc0da2ea1dfadb458c4f061f 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 b1c7f692ebff13a3634a4fe0397d0625e52a0337..7551feda1517a5667916a865957daa720d5d3e3b 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 = ""