OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 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 | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'includes': [ | 6 'includes': [ |
7 '../build/common_untrusted.gypi', | 7 '../build/common_untrusted.gypi', |
8 ], | 8 ], |
9 | 9 |
10 'variables': { | 10 'variables': { |
11 'remoting_key_tester_js_files': [ | 11 'remoting_key_tester_js_files': [ |
12 'tools/javascript_key_tester/background.js', | 12 'tools/javascript_key_tester/background.js', |
13 'tools/javascript_key_tester/chord_tracker.js', | 13 'tools/javascript_key_tester/chord_tracker.js', |
| 14 'tools/javascript_key_tester/event_listeners.js', |
14 'tools/javascript_key_tester/keyboard_map.js', | 15 'tools/javascript_key_tester/keyboard_map.js', |
15 'tools/javascript_key_tester/main.js', | 16 'tools/javascript_key_tester/main.js', |
16 ], | 17 ], |
17 }, | 18 }, |
18 | 19 |
19 'conditions': [ | 20 'conditions': [ |
20 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 21 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
21 'targets': [ | 22 'targets': [ |
22 { | 23 { |
23 'target_name': 'remoting_key_tester', | 24 'target_name': 'remoting_key_tester', |
(...skipping 14 matching lines...) Expand all Loading... |
38 '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe', | 39 '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe', |
39 ], | 40 ], |
40 } | 41 } |
41 ], | 42 ], |
42 }, # end of target 'remoting_key_tester' | 43 }, # end of target 'remoting_key_tester' |
43 | 44 |
44 { | 45 { |
45 'target_name': 'remoting_key_tester_jscompile', | 46 'target_name': 'remoting_key_tester_jscompile', |
46 'type': 'none', | 47 'type': 'none', |
47 'conditions': [ | 48 'conditions': [ |
48 # TODO(lukasza): Enable when remoting_key_tester_jscompile is clean. | 49 ['run_jscompile != 0', { |
49 # ['run_jscompile != 0', { | |
50 ['0 != 0', { | |
51 'variables': { | 50 'variables': { |
52 'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp', | 51 'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp', |
53 }, | 52 }, |
54 'actions': [ | 53 'actions': [ |
55 { | 54 { |
56 'action_name': 'jscompile remoting_key_tester', | 55 'action_name': 'jscompile remoting_key_tester', |
57 'inputs': [ | 56 'inputs': [ |
58 '<@(remoting_key_tester_js_files)', | 57 '<@(remoting_key_tester_js_files)', |
| 58 'webapp/js_proto/chrome_proto.js' |
59 ], | 59 ], |
60 'outputs': [ | 60 'outputs': [ |
61 '<(success_stamp)', | 61 '<(success_stamp)', |
62 ], | 62 ], |
63 'action': [ | 63 'action': [ |
64 'python', '../third_party/closure_compiler/checker.py', | 64 'python', '../third_party/closure_compiler/checker.py', |
65 '--strict', | 65 '--strict', |
66 '--no-single-file', | 66 '--no-single-file', |
67 '--success-stamp', '<(success_stamp)', | 67 '--success-stamp', '<(success_stamp)', |
68 '<@(remoting_key_tester_js_files)', | 68 '<@(remoting_key_tester_js_files)', |
| 69 'webapp/js_proto/chrome_proto.js' |
69 ], | 70 ], |
70 }, | 71 }, |
71 ], # actions | 72 ], # actions |
72 }], | 73 }], |
73 ], | 74 ], |
74 }, # end of target 'remoting_key_tester_jscompile' | 75 }, # end of target 'remoting_key_tester_jscompile' |
75 | 76 |
76 { | 77 { |
77 'target_name': 'remoting_key_tester_pexe', | 78 'target_name': 'remoting_key_tester_pexe', |
78 'type': 'none', | 79 'type': 'none', |
(...skipping 12 matching lines...) Expand all Loading... |
91 }, | 92 }, |
92 'link_flags': [ | 93 'link_flags': [ |
93 '-lppapi_stub', | 94 '-lppapi_stub', |
94 '-lppapi_cpp', | 95 '-lppapi_cpp', |
95 ], | 96 ], |
96 }, # end of target 'remoting_key_tester_pexe' | 97 }, # end of target 'remoting_key_tester_pexe' |
97 ], | 98 ], |
98 }] | 99 }] |
99 ], | 100 ], |
100 } | 101 } |
OLD | NEW |