From 61cc5cc773d78b2621bab9be25dcad9fa478813b Mon Sep 17 00:00:00 2001
From: zhuoli <pengzhuoli@huawei.com>
Date: Wed, 2 Nov 2022 09:50:21 +0800
Subject: [PATCH] Add output dir for prebuilt gn targets to avoid having
 multiple rules generating the same target

Signed-off-by: zhuoli <pengzhuoli@huawei.com>
Change-Id: I43b6bb32515cffa750a4fab9f59a187f43442da1
---
 legacy_bin/BUILD.gn | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/legacy_bin/BUILD.gn b/legacy_bin/BUILD.gn
index c8e5856335..542b8377e6 100644
--- a/legacy_bin/BUILD.gn
+++ b/legacy_bin/BUILD.gn
@@ -16,72 +16,84 @@ import("//build/ohos.gni")
 # for js-loader
 ohos_prebuilt_executable("js_js2abc_api8_linux") {
   source = "./api8/bin/linux/js2abc"
+  output = "js_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_executable("js_js2abc_api8_win") {
   source = "./api8/bin/win/js2abc.exe"
+  output = "js_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_executable("js_js2abc_api8_mac") {
   source = "./api8/bin/mac/js2abc"
+  output = "js_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_ts2abc_api8_linux") {
   source = "./api8/src/index.js"
+  output = "js_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_ts2abc_api8_win") {
   source = "./api8/src/index.js"
+  output = "js_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_ts2abc_api8_mac") {
   source = "./api8/src/index.js"
+  output = "js_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package_api8_linux") {
   source = "./api8/package.json"
+  output = "js_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package_api8_win") {
   source = "./api8/package.json"
+  output = "js_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package_api8_mac") {
   source = "./api8/package.json"
+  output = "js_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package-lock_api8_linux") {
   source = "./api8/package-lock.json"
+  output = "js_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package-lock_api8_win") {
   source = "./api8/package-lock.json"
+  output = "js_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("js_package-lock_api8_mac") {
   source = "./api8/package-lock.json"
+  output = "js_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
@@ -89,72 +101,84 @@ ohos_prebuilt_etc("js_package-lock_api8_mac") {
 # for ets-loader
 ohos_prebuilt_executable("ets_js2abc_api8_linux") {
   source = "./api8/bin/linux/js2abc"
+  output = "ets_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_executable("ets_js2abc_api8_win") {
   source = "./api8/bin/win/js2abc.exe"
+  output = "ets_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_executable("ets_js2abc_api8_mac") {
   source = "./api8/bin/mac/js2abc"
+  output = "ets_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_ts2abc_api8_linux") {
   source = "./api8/src/index.js"
+  output = "ets_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_ts2abc_api8_win") {
   source = "./api8/src/index.js"
+  output = "ets_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_ts2abc_api8_mac") {
   source = "./api8/src/index.js"
+  output = "ets_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package_api8_linux") {
   source = "./api8/package.json"
+  output = "ets_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package_api8_win") {
   source = "./api8/package.json"
+  output = "ets_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package_api8_mac") {
   source = "./api8/package.json"
+  output = "ets_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package-lock_api8_linux") {
   source = "./api8/package-lock.json"
+  output = "ets_linux/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package-lock_api8_win") {
   source = "./api8/package-lock.json"
+  output = "ets_win/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
 
 ohos_prebuilt_etc("ets_package-lock_api8_mac") {
   source = "./api8/package-lock.json"
+  output = "ets_mac/${source}"
   part_name = "ets_frontend"
   subsystem_name = "arkcompiler"
 }
-- 
Gitee