Refactor compile_js.gypi to support script_args and closure_args

remoting/remoting_webapp_compile.gypi

Index: remoting/remoting_webapp_compile.gypi
diff --git a/remoting/remoting_webapp_compile.gypi b/remoting/remoting_webapp_compile.gypi
index 92618b84ac5ba8d4fdb4d257007ef54e7f078b75..ba6184f2271f0458f59c98bfe8a60d9b297004b6 100644
--- a/remoting/remoting_webapp_compile.gypi
+++ b/remoting/remoting_webapp_compile.gypi
@@ -5,83 +5,56 @@
 # File in charge of Closure compiling remoting's webapp.
 
 {
-  'variables': {
-    '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',
-    'externs': [
-      '<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js',
-      '<@(remoting_webapp_js_externs_files)',
-    ],
-    'compiler_flags': [
-      '--strict',
-      '--no-single-file',
-      '--externs',
-      '<(externs)',
-    ],
-  },
-  'actions': [
+  'targets': [
     {
-      'action_name': 'Verify remoting webapp',
+      'target_name': 'verify_remoting_webapp',
       'inputs': [
         'remoting_webapp_compile.gypi',
         'remoting_webapp_files.gypi',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_js_externs_files)',
-        '<@(remoting_webapp_js_proto_files)',
-      ],
-      '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)',
+        ],
+        'externs': ['<@(remoting_webapp_js_externs_files)'],
+        'out_file': '<(PRODUCT_DIR)/<(_target_name)_jscompile.stamp',
+      },
+      'includes': ['compile_js.gypi'],
     },
     {
-      'action_name': 'Verify remoting webapp with browsertests',
+      'target_name': 'verify_remoting_webapp_with_browsertests',
       '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)',
+        ],
+        'externs': ['<@(remoting_webapp_js_externs_files)'],
+        'out_file': '<(PRODUCT_DIR)/<(_target_name)_bt_jscompile.stamp',
+      },
+      'includes': ['compile_js.gypi'],
     },
     {
-      'action_name': 'Verify remoting webapp unittests',
+      'target_name': 'verify_remoting_webapp_unittests',
       '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)',
+        ],
+        'externs': ['<@(remoting_webapp_js_externs_files)'],
+        'out_file': '<(PRODUCT_DIR)/<(_target_name)_ut_jscompile.stamp',
+      },
+      'includes': ['compile_js.gypi'],
     },
   ],
   'includes': ['remoting_webapp_files.gypi'],