Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / native_client / BUILD.gn

diff --git a/src/native_client/BUILD.gn b/src/native_client/BUILD.gn
index 5e86502..b1e3e96 100644 (file)
--- a/src/native_client/BUILD.gn
+++ b/src/native_client/BUILD.gn
@@ -14,35 +14,46 @@
 # combinations of the real targets.
 #
 
-group("trusted") {
+if (os == "linux") {
+  group("trusted_arm") {
+    deps = [
+      "//native_client/src:trusted_targets(//native_client/build/toolchain/$os:trusted_arm)",
+    ]
+  }
+}
+
+group("trusted_32") {
   deps = [
-    "//native_client/src:trusted_targets(//native_client/build/toolchain/linux:trusted_x86)",
-    "//native_client/src:trusted_targets(//native_client/build/toolchain/linux:trusted_x64)",
+    "//native_client/src:trusted_targets(//native_client/build/toolchain/$os:trusted_x86)",
   ]
 }
 
-#
-# TODO(noelallen) : BUG# 386243
-# Remove the need for a target to prep all toolchains once a Cooked toolchain
-# can depend on the correct prep steps.
-#
-group("prep_toolchains") {
+group("trusted_64") {
   deps = [
-    "//native_client/build/toolchain:prep_x86_newlib",
-    "//native_client/build/toolchain:prep_arm_newlib",
+    "//native_client/src:trusted_targets(//native_client/build/toolchain/$os:trusted_x64)",
   ]
 }
 
+
 #
 # This is the root untrusted target which will build all trusted components
 #
 group("untrusted") {
   deps = []
   if (use_newlib) {
-    deps += [
-      "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_x86)",
-      "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_x64)",
-      "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_arm)",
-    ]
+    if (use_nacl_x86) {
+      deps += [
+        "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_x86)"
+      ]
+    }
+    if (use_nacl_x64) {
+      deps += [
+        "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_x64)",
+      ]
+    }
+    if (use_nacl_arm) {
+      deps += [ "//native_client/src/:untrusted_targets(//native_client/build/toolchain/nacl:newlib_arm)",
+      ]
+    }
   }
 }