From da66106307e461cae9d5f21be41d6ba05ab6588d Mon Sep 17 00:00:00 2001 From: lubinglun Date: Sun, 23 Apr 2023 19:57:47 +0800 Subject: [PATCH 1/2] Update nodejs to 14.21.1 Issue:https://gitee.com/openharmony/build/issues/I6TECN Test:build Signed-off-by: lubinglun Change-Id: I361c89e6b0e6f76399674a3b104ebfb2b3801ecb --- BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index e85322c..72215e0 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -46,17 +46,17 @@ action("build_ace_loader_library") { # different host platform nodejs tool directory if (host_os == "linux") { if (is_standard_system) { - nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-linux-x64/bin/node" + nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v14.21.1-linux-x64/bin/node" } else { nodejs_path = - "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-linux-x64/bin/node" + "//prebuilts/ace-toolkit/nodejs/node-v14.21.1-linux-x64/bin/node" } } else if (host_os == "mac") { if (is_standard_system) { - nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v12.18.4-darwin-x64/bin/node" + nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v14.21.1-darwin-x64/bin/node" } else { nodejs_path = - "//prebuilts/ace-toolkit/nodejs/node-v12.18.4-darwin-x64/bin/node" + "//prebuilts/ace-toolkit/nodejs/node-v14.21.1-darwin-x64/bin/node" } } else { assert(false, "Unsupported host_os: $host_os") From 72831dd2a640be935e623369f9c19ce7e38631e4 Mon Sep 17 00:00:00 2001 From: lubinglun Date: Mon, 24 Apr 2023 22:09:15 +0800 Subject: [PATCH 2/2] replace nodejs dir to current Signed-off-by: lubinglun Change-Id: Iac23ec2663866643298b85ef95988c83cdb2fb6f --- BUILD.gn | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 72215e0..9efb25e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -43,24 +43,7 @@ action("build_ace_loader_library") { _uglify_source_js, ] - # different host platform nodejs tool directory - if (host_os == "linux") { - if (is_standard_system) { - nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v14.21.1-linux-x64/bin/node" - } else { - nodejs_path = - "//prebuilts/ace-toolkit/nodejs/node-v14.21.1-linux-x64/bin/node" - } - } else if (host_os == "mac") { - if (is_standard_system) { - nodejs_path = "//prebuilts/build-tools/common/nodejs/node-v14.21.1-darwin-x64/bin/node" - } else { - nodejs_path = - "//prebuilts/ace-toolkit/nodejs/node-v14.21.1-darwin-x64/bin/node" - } - } else { - assert(false, "Unsupported host_os: $host_os") - } + nodejs_path = "//prebuilts/build-tools/common/nodejs/current/bin/node" args = [ "--depfile",