Chromium Code Reviews| 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': { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 'tools/javascript_key_tester/manifest.json', | 36 'tools/javascript_key_tester/manifest.json', |
| 37 'tools/javascript_key_tester/icon_128.png', | 37 'tools/javascript_key_tester/icon_128.png', |
| 38 'tools/javascript_key_tester/pnacl/remoting_key_tester.nmf', | 38 'tools/javascript_key_tester/pnacl/remoting_key_tester.nmf', |
| 39 '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe', | 39 '<(PRODUCT_DIR)/remoting_key_tester_newlib.pexe', |
| 40 ], | 40 ], |
| 41 } | 41 } |
| 42 ], | 42 ], |
| 43 }, # end of target 'remoting_key_tester' | 43 }, # end of target 'remoting_key_tester' |
| 44 | 44 |
| 45 { | 45 { |
| 46 'target_name': 'remoting_key_tester_jscompile', | 46 'target_name': 'remoting_key_tester_jscompile', |
|
Theresa
2015/06/01 15:39:26
Do we want to decouple the target_name from the so
| |
| 47 'type': 'none', | 47 'type': 'none', |
| 48 'conditions': [ | 48 'conditions': [ |
| 49 ['run_jscompile != 0', { | 49 ['run_jscompile != 0', { |
| 50 'variables': { | 50 'variables': { |
| 51 'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp', | 51 'success_stamp': '<(PRODUCT_DIR)/<(_target_name).stamp', |
| 52 'source_files': [ | |
| 53 '<@(remoting_key_tester_js_files)', | |
| 54 'webapp/js_proto/chrome_proto.js', | |
| 55 'webapp/js_proto/chrome_event_proto.js', | |
| 56 ], | |
| 57 'script_args' : [ | |
| 58 '--no-single-file', | |
| 59 '--success-stamp', '<(success_stamp)', | |
| 60 '--out_file', '<(success_stamp)', | |
| 61 ], | |
| 62 'closure_args' : [ | |
| 63 "--jscomp_error=reportUnknownTypes", | |
| 64 "--jscomp_error=duplicate", | |
| 65 "--jscomp_error=misplacedTypeAnnotation", | |
| 66 ] | |
| 52 }, | 67 }, |
| 53 'actions': [ | 68 'includes': [ |
| 54 { | 69 '../../../third_party/closure_compiler/compile_js.gypi' |
| 55 'action_name': 'jscompile remoting_key_tester', | 70 ], |
| 56 'inputs': [ | |
| 57 '<@(remoting_key_tester_js_files)', | |
| 58 'webapp/js_proto/chrome_proto.js', | |
| 59 'webapp/js_proto/chrome_event_proto.js', | |
| 60 ], | |
| 61 'outputs': [ | |
| 62 '<(success_stamp)', | |
| 63 ], | |
| 64 'action': [ | |
| 65 'python', '../third_party/closure_compiler/compile.py', | |
| 66 '--strict', | |
| 67 '--no-single-file', | |
| 68 '--success-stamp', '<(success_stamp)', | |
| 69 '<@(remoting_key_tester_js_files)', | |
| 70 'webapp/js_proto/chrome_proto.js', | |
| 71 'webapp/js_proto/chrome_event_proto.js', | |
| 72 ], | |
| 73 }, | |
| 74 ], # actions | |
| 75 }], | 71 }], |
| 76 ], | 72 ], |
| 77 }, # end of target 'remoting_key_tester_jscompile' | 73 }, # end of target 'remoting_key_tester_jscompile' |
| 78 | 74 |
| 79 { | 75 { |
| 80 'target_name': 'remoting_key_tester_pexe', | 76 'target_name': 'remoting_key_tester_pexe', |
| 81 'type': 'none', | 77 'type': 'none', |
| 82 'sources': [ | 78 'sources': [ |
| 83 'tools/javascript_key_tester/pnacl/remoting_key_tester.cc', | 79 'tools/javascript_key_tester/pnacl/remoting_key_tester.cc', |
| 84 ], | 80 ], |
| 85 'variables': { | 81 'variables': { |
| 86 'nexe_target': 'remoting_key_tester', | 82 'nexe_target': 'remoting_key_tester', |
| 87 'build_glibc': 0, | 83 'build_glibc': 0, |
| 88 'build_newlib': 0, | 84 'build_newlib': 0, |
| 89 'build_pnacl_newlib': 1, | 85 'build_pnacl_newlib': 1, |
| 90 'extra_deps_pnacl_newlib': [ | 86 'extra_deps_pnacl_newlib': [ |
| 91 '>(tc_lib_dir_pnacl_newlib)/libppapi.a', | 87 '>(tc_lib_dir_pnacl_newlib)/libppapi.a', |
| 92 '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a', | 88 '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a', |
| 93 ], | 89 ], |
| 94 }, | 90 }, |
| 95 'link_flags': [ | 91 'link_flags': [ |
| 96 '-lppapi_stub', | 92 '-lppapi_stub', |
| 97 '-lppapi_cpp', | 93 '-lppapi_cpp', |
| 98 ], | 94 ], |
| 99 }, # end of target 'remoting_key_tester_pexe' | 95 }, # end of target 'remoting_key_tester_pexe' |
| 100 ], | 96 ], |
| 101 }] | 97 }] |
| 102 ], | 98 ], |
| 103 } | 99 } |
| OLD | NEW |