Handling PNaCl KeyboardInputEvent(s) in the key tester app.

remoting/remoting_key_tester.gypi

Index: remoting/remoting_key_tester.gypi
diff --git a/remoting/remoting_key_tester.gypi b/remoting/remoting_key_tester.gypi
new file mode 100644
index 0000000000000000000000000000000000000000..b3d0aa9902491d8eb34de4a7eb06ff48010ee3a5
--- /dev/null
+++ b/remoting/remoting_key_tester.gypi
@@ -0,0 +1,107 @@
+# 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.
+
+{
+  'includes': [
+    '../native_client/build/untrusted.gypi',

[teravest, 2015/02/02 15:54:06]

I believe you want to include build/common_untrusted.gypi here instead of
native_client/build/untrusted.gypi.

[Łukasz Anforowicz, 2015/02/02 22:26:52]

The include is needed to bring in tc_lib_dir_pnacl_newlib variable.

Including ../build/common_untrusted.gypi also works.

I've changed to ../build/common_untrusted.gypi here and also in
src/remoting/remoting_nacl.gypi

+  ],
+
+  'variables': {
+    'remoting_key_tester_js_files': [
+        'tools/javascript_key_tester/background.js',
+        'tools/javascript_key_tester/chord_tracker.js',
+        'tools/javascript_key_tester/keyboard_map.js',
+        'tools/javascript_key_tester/main.js',
+     ],
+  },
+
+  'targets': [
+    {
+      'target_name': 'remoting_key_tester',
+      'type': 'none',
+      'dependencies': [
+        'remoting_key_tester_pexe',
+      ],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/remoting/key_tester',
+          'files': [
+            '<@(remoting_key_tester_js_files)',
+            'tools/javascript_key_tester/main.css',
+            'tools/javascript_key_tester/main.html',
+            'tools/javascript_key_tester/manifest.json',
+            'tools/javascript_key_tester/pnacl/remoting_key_tester.nmf',
+            '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe',
+          ],
+        }
+      ],
+#      TODO(lukasza): Make remoting_key_tester jscompile-clean.
+#      'conditions': [
+#        ['run_jscompile != 0', {
+#          'dependencies': [
+#            'remoting_key_tester_jscompile',
+#          ],
+#        }],
+#      ],
+    },  # end of target 'remoting_key_tester'
+
+    {
+      'target_name': 'remoting_key_tester_jscompile',
+      'type': 'none',
+      'variables': {
+        'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp',
+      },
+      'actions': [
+        {
+          'action_name': 'jscompile remoting_key_tester',
+          'inputs': [
+            '<@(remoting_key_tester_js_files)',
+          ],
+          'outputs': [
+            '<(success_stamp)',
+          ],
+          'action': [
+            'python', '../third_party/closure_compiler/checker.py',
+            '--strict',
+            '--no-single-file',
+            '--success-stamp', '<(success_stamp)',
+            '<@(remoting_key_tester_js_files)',
+          ],
+        },
+      ],  # actions
+    },  # end of target 'remoting_key_tester_jscompile'
+
+    {
+      'target_name': 'remoting_key_tester_pexe',
+      'type': 'none',
+      'sources': [
+        'tools/javascript_key_tester/pnacl/remoting_key_tester.cc',
+      ],
+      'variables': {
+        'nacl_untrusted_build': 1,

[teravest, 2015/02/02 15:54:06]

Are you sure you need to use nacl_untrusted_build here? I'm surprised; other
rules that build pexes don't look quite like this.

[Łukasz Anforowicz, 2015/02/02 22:26:52]

Fixed (removed this line).  I should have more carefully vet the gyp rules I
copied from remoting_nacl.gyp.

+        'nexe_target': 'remoting_key_tester',
+        'build_glibc': 0,
+        'build_newlib': 0,
+        'build_pnacl_newlib': 1,
+        'extra_deps_pnacl_newlib': [
+          '>(tc_lib_dir_pnacl_newlib)/libppapi.a',
+          '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a',
+        ],
+      },
+      'dependencies': [

[teravest, 2015/02/02 15:54:06]

Do you need these dependencies and link flags?

[Łukasz Anforowicz, 2015/02/02 22:26:52]

Without -lppapi_cpp I get: undefined reference to pp::Module::Init()

Without -lppapi_stub I get: libnacl.a: error: undefined reference to 'main'

I've removed other link_flags.


I am not sure about the dependencies.  Removing the dependencies doesn't hurt
anything (i.e. ninja says: "no work to do"), and I hope ninja would complain if
there were actual dependencies that were not reflected in the gyp file.  After
removing the dependencies rebuilding is triggered after making a minor edit in
ppapi/cpp/input_event.h, so I guess I can leave these dependencies out.

+        '../ppapi/native_client/native_client.gyp:nacl_irt',
+        '../ppapi/native_client/native_client.gyp:ppapi_lib',
+        '../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
+      ],
+      'link_flags': [
+        '-lppapi_stub',
+
+        # Base NaCl libraries.
+        '-lppapi_cpp',
+        '-lpthread',
+        '-lnacl_io',
+      ],
+    },  # end of target 'remoting_key_tester_pexe'
+  ],
+}