GN: Enable PNaCl plugin compilation for the key_tester app.

BUG=512899

Review URL: https://codereview.chromium.org/1305863002

Cr-Commit-Position: refs/heads/master@{#344606}

4 files changed, 66 insertions, 53 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 511e21f..a288521 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -422,10 +422,6 @@ group("both_gn_and_gyp") {
       deps += [ "//components/nacl:nacl_loader_unittests" ]
     }
 
-    if (enable_nacl && enable_remoting) {
-      deps += [ "//remoting:remoting_key_tester" ]
-    }
-
     if (media_use_ffmpeg) {
       deps += [ "//media:ffmpeg_regression_tests" ]
     }
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index 4895f28..211a165 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -66,9 +66,8 @@ group("remoting_all") {
     ]
   }
 
-  # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl.
   if (enable_nacl) {
-    deps += [ "//remoting:remoting_key_tester" ]
+    deps += [ "//remoting/tools/javascript_key_tester" ]
   }
 }
 
@@ -190,50 +189,3 @@ if (!is_mac) {
   group("remoting_unittests") {
   }
 }
-
-if (enable_pnacl) {
-  group("remoting_key_tester") {
-    deps = [
-      ":remoting_key_tester_copies",
-    ]
-  }
-
-  copy("remoting_key_tester_copies") {
-    sources = [
-      "tools/javascript_key_tester/background.js",
-      "tools/javascript_key_tester/chord_tracker.js",
-      "tools/javascript_key_tester/event_listeners.js",
-      "tools/javascript_key_tester/icon_128.png",
-      "tools/javascript_key_tester/main.css",
-      "tools/javascript_key_tester/main.html",
-      "tools/javascript_key_tester/main.js",
-      "tools/javascript_key_tester/manifest.json",
-      "tools/javascript_key_tester/pnacl/remoting_key_tester.nmf",
-
-      # TODO(GYP): crbug.com/471924 "$target_out_dir/remoting_key_tester_newlib.pexe",
-    ]
-
-    outputs = [
-      "$target_out_dir/remoting/key_tester/{{source_file_part}}",
-    ]
-
-    deps = [
-      ":remoting_key_tester_jscompile",
-      ":remoting_key_tester_pexe",
-    ]
-  }
-
-  group("remoting_key_tester_jscompile") {
-    # TODO(GYP): crbug.com/471926 add support for run_jscompile=true.
-    run_jscompile = false
-    if (run_jscompile) {
-    }
-  }
-
-  group("remoting_key_tester_pexe") {
-    # TODO(GYP): crbug.com/471924 implement me when we have a pnacl toolchain.
-    #sources = [
-    # "tools/javascript_key_tester/pnacl/remoting_key_tester.cc",
-    #]
-  }
-}
diff --git a/remoting/tools/javascript_key_tester/BUILD.gn b/remoting/tools/javascript_key_tester/BUILD.gn
new file mode 100644
index 0000000..bd91953
--- /dev/null
+++ b/remoting/tools/javascript_key_tester/BUILD.gn
@@ -0,0 +1,48 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/features.gni")
+
+if (enable_pnacl) {
+  group("javascript_key_tester") {
+    deps = [
+      ":javascript_key_tester_copies",
+    ]
+  }
+
+  copy("javascript_key_tester_copies") {
+    pexe_dir = get_label_info(
+            "pnacl:remoting_key_tester_newlib(//native_client/build/toolchain/nacl:newlib_pnacl)",
+            "root_out_dir")
+
+    sources = [
+      "$pexe_dir/remoting_key_tester_newlib.pexe",
+      "background.js",
+      "chord_tracker.js",
+      "event_listeners.js",
+      "icon_128.png",
+      "main.css",
+      "main.html",
+      "main.js",
+      "manifest.json",
+      "pnacl/remoting_key_tester.nmf",
+    ]
+
+    outputs = [
+      "$target_out_dir/remoting/key_tester/{{source_file_part}}",
+    ]
+
+    deps = [
+      ":javascript_key_tester_jscompile",
+      "pnacl:remoting_key_tester_newlib(//native_client/build/toolchain/nacl:newlib_pnacl)",
+    ]
+  }
+
+  group("javascript_key_tester_jscompile") {
+    # TODO(GYP): crbug.com/471926 add support for run_jscompile=true.
+    run_jscompile = false
+    if (run_jscompile) {
+    }
+  }
+}
diff --git a/remoting/tools/javascript_key_tester/pnacl/BUILD.gn b/remoting/tools/javascript_key_tester/pnacl/BUILD.gn
new file mode 100644
index 0000000..6ce4081
--- /dev/null
+++ b/remoting/tools/javascript_key_tester/pnacl/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+assert(is_nacl,
+       "These targets must only be built using the untrusted NaCl toolchains.")
+
+executable("remoting_key_tester_newlib") {
+  sources = [
+    "remoting_key_tester.cc",
+  ]
+
+  deps = [
+    "//ppapi/native_client:ppapi_lib",
+    "//ppapi/cpp",
+  ]
+}