Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | |
| 2 # Use of this source code is governed by a BSD-style license that can be | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'includes': [ | |
| 7 '../native_client/build/untrusted.gypi', | |
|
teravest
2015/02/02 15:54:06
I believe you want to include build/common_untrust
Łukasz Anforowicz
2015/02/02 22:26:52
The include is needed to bring in tc_lib_dir_pnacl
| |
| 8 ], | |
| 9 | |
| 10 'variables': { | |
| 11 'remoting_key_tester_js_files': [ | |
| 12 'tools/javascript_key_tester/background.js', | |
| 13 'tools/javascript_key_tester/chord_tracker.js', | |
| 14 'tools/javascript_key_tester/keyboard_map.js', | |
| 15 'tools/javascript_key_tester/main.js', | |
| 16 ], | |
| 17 }, | |
| 18 | |
| 19 'targets': [ | |
| 20 { | |
| 21 'target_name': 'remoting_key_tester', | |
| 22 'type': 'none', | |
| 23 'dependencies': [ | |
| 24 'remoting_key_tester_pexe', | |
| 25 ], | |
| 26 'copies': [ | |
| 27 { | |
| 28 'destination': '<(PRODUCT_DIR)/remoting/key_tester', | |
| 29 'files': [ | |
| 30 '<@(remoting_key_tester_js_files)', | |
| 31 'tools/javascript_key_tester/main.css', | |
| 32 'tools/javascript_key_tester/main.html', | |
| 33 'tools/javascript_key_tester/manifest.json', | |
| 34 'tools/javascript_key_tester/pnacl/remoting_key_tester.nmf', | |
| 35 '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe', | |
| 36 ], | |
| 37 } | |
| 38 ], | |
| 39 # TODO(lukasza): Make remoting_key_tester jscompile-clean. | |
| 40 # 'conditions': [ | |
| 41 # ['run_jscompile != 0', { | |
| 42 # 'dependencies': [ | |
| 43 # 'remoting_key_tester_jscompile', | |
| 44 # ], | |
| 45 # }], | |
| 46 # ], | |
| 47 }, # end of target 'remoting_key_tester' | |
| 48 | |
| 49 { | |
| 50 'target_name': 'remoting_key_tester_jscompile', | |
| 51 'type': 'none', | |
| 52 'variables': { | |
| 53 'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp', | |
| 54 }, | |
| 55 'actions': [ | |
| 56 { | |
| 57 'action_name': 'jscompile remoting_key_tester', | |
| 58 'inputs': [ | |
| 59 '<@(remoting_key_tester_js_files)', | |
| 60 ], | |
| 61 'outputs': [ | |
| 62 '<(success_stamp)', | |
| 63 ], | |
| 64 'action': [ | |
| 65 'python', '../third_party/closure_compiler/checker.py', | |
| 66 '--strict', | |
| 67 '--no-single-file', | |
| 68 '--success-stamp', '<(success_stamp)', | |
| 69 '<@(remoting_key_tester_js_files)', | |
| 70 ], | |
| 71 }, | |
| 72 ], # actions | |
| 73 }, # end of target 'remoting_key_tester_jscompile' | |
| 74 | |
| 75 { | |
| 76 'target_name': 'remoting_key_tester_pexe', | |
| 77 'type': 'none', | |
| 78 'sources': [ | |
| 79 'tools/javascript_key_tester/pnacl/remoting_key_tester.cc', | |
| 80 ], | |
| 81 'variables': { | |
| 82 'nacl_untrusted_build': 1, | |
|
teravest
2015/02/02 15:54:06
Are you sure you need to use nacl_untrusted_build
Łukasz Anforowicz
2015/02/02 22:26:52
Fixed (removed this line). I should have more car
| |
| 83 'nexe_target': 'remoting_key_tester', | |
| 84 'build_glibc': 0, | |
| 85 'build_newlib': 0, | |
| 86 'build_pnacl_newlib': 1, | |
| 87 'extra_deps_pnacl_newlib': [ | |
| 88 '>(tc_lib_dir_pnacl_newlib)/libppapi.a', | |
| 89 '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a', | |
| 90 ], | |
| 91 }, | |
| 92 '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
| |
| 93 '../ppapi/native_client/native_client.gyp:nacl_irt', | |
| 94 '../ppapi/native_client/native_client.gyp:ppapi_lib', | |
| 95 '../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib', | |
| 96 ], | |
| 97 'link_flags': [ | |
| 98 '-lppapi_stub', | |
| 99 | |
| 100 # Base NaCl libraries. | |
| 101 '-lppapi_cpp', | |
| 102 '-lpthread', | |
| 103 '-lnacl_io', | |
| 104 ], | |
| 105 }, # end of target 'remoting_key_tester_pexe' | |
| 106 ], | |
| 107 } | |
| OLD | NEW |