Chromium Code Reviews| Index: remoting/remoting_webapp_compile.gypi |
| diff --git a/remoting/remoting_webapp_compile.gypi b/remoting/remoting_webapp_compile.gypi |
| index f30195c061dd09c31c74154e59b785399dc2b63b..9fd50c8eb67bb993f3924cd645f7c1f5a6161682 100644 |
| --- a/remoting/remoting_webapp_compile.gypi |
| +++ b/remoting/remoting_webapp_compile.gypi |
| @@ -9,74 +9,54 @@ |
| 'success_stamp': '<(PRODUCT_DIR)/<(_target_name)_jscompile.stamp', |
| 'success_stamp_bt': '<(PRODUCT_DIR)/<(_target_name)_bt_jscompile.stamp', |
| 'success_stamp_ut': '<(PRODUCT_DIR)/<(_target_name)_ut_jscompile.stamp', |
| - 'compiler_flags': [ |
| - '--strict', |
| - '--no-single-file', |
| - '--externs', |
| - '<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js', |
| - ], |
| }, |
| 'actions': [ |
| { |
| 'action_name': 'Verify remoting webapp', |
| + 'includes': ['compile_js.gypi'], |
| 'inputs': [ |
| 'remoting_webapp_compile.gypi', |
| 'remoting_webapp_files.gypi', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_js_proto_files)', |
|
Dan Beam
2015/06/08 21:25:45
are these no longer necessary because |source_file
Theresa
2015/06/09 21:21:06
Yep.
|
| - ], |
| - 'outputs': [ |
| - '<(success_stamp)', |
| - ], |
| - 'action': [ |
| - 'python', '<(DEPTH)/third_party/closure_compiler/compile.py', |
| - '<@(compiler_flags)', |
| - '--success-stamp', '<(success_stamp)', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_js_proto_files)', |
| ], |
| + 'variables': { |
| + 'source_files': [ |
| + '<@(remoting_webapp_crd_js_files)', |
| + '<@(remoting_webapp_js_proto_files)', |
| + ], |
| + 'out_file': '<(success_stamp)', |
| + }, |
| }, |
| { |
| 'action_name': 'Verify remoting webapp with browsertests', |
| + 'includes': ['compile_js.gypi'], |
| 'inputs': [ |
| 'remoting_webapp_compile.gypi', |
| 'remoting_webapp_files.gypi', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_browsertest_all_js_files)', |
| - '<@(remoting_webapp_browsertest_js_proto_files)', |
| - ], |
| - 'outputs': [ |
| - '<(success_stamp_bt)', |
| - ], |
| - 'action': [ |
| - 'python', '<(DEPTH)/third_party/closure_compiler/compile.py', |
| - '<@(compiler_flags)', |
| - '--success-stamp', '<(success_stamp_bt)', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_browsertest_all_js_files)', |
| - '<@(remoting_webapp_browsertest_js_proto_files)', |
| ], |
| + 'variables': { |
| + 'source_files': [ |
| + '<@(remoting_webapp_crd_js_files)', |
| + '<@(remoting_webapp_browsertest_all_js_files)', |
| + '<@(remoting_webapp_browsertest_js_proto_files)', |
| + ], |
| + 'out_file': '<(success_stamp_bt)', |
| + }, |
| }, |
| { |
| 'action_name': 'Verify remoting webapp unittests', |
| + 'includes': ['compile_js.gypi'], |
| 'inputs': [ |
| 'remoting_webapp_compile.gypi', |
| 'remoting_webapp_files.gypi', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_unittests_all_js_files)', |
| - '<@(remoting_webapp_unittests_js_proto_files)', |
| - ], |
| - 'outputs': [ |
| - '<(success_stamp_ut)', |
| - ], |
| - 'action': [ |
| - 'python', '<(DEPTH)/third_party/closure_compiler/compile.py', |
| - '<@(compiler_flags)', |
| - '--success-stamp', '<(success_stamp_ut)', |
| - '<@(remoting_webapp_crd_js_files)', |
| - '<@(remoting_webapp_unittests_all_js_files)', |
| - '<@(remoting_webapp_unittests_js_proto_files)', |
| ], |
| + 'variables': { |
| + 'source_files': [ |
| + '<@(remoting_webapp_crd_js_files)', |
| + '<@(remoting_webapp_unittests_all_js_files)', |
| + '<@(remoting_webapp_unittests_js_proto_files)', |
| + ], |
| + 'out_file': '<(success_stamp_ut)', |
| + }, |
| }, |
| ], |
| 'includes': ['remoting_webapp_files.gypi'], |