Use PNaCl in V2 builds of the remoting webapp

remoting/remoting_client.gypi

Index: remoting/remoting_client.gypi
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index 51777913c43e7ef34f491d953a2992f9a711bb78..5866c174ac6b4716e92185b61dbd2cba39d63c55 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -92,12 +92,11 @@
       'type': 'none',
       'dependencies': [
         'remoting_webapp_v1',
-        'remoting_webapp_v2',
       ],
       'conditions': [
         ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'dependencies': [
-            'remoting_webapp_pnacl',
+            'remoting_webapp_v2',
           ],
         }],
       ],
@@ -113,34 +112,21 @@
       },
       'includes': [ 'remoting_webapp.gypi', ],
     },  # end of target 'remoting_webapp_v1'
-
-    {
-      'target_name': 'remoting_webapp_v2',
-      'type': 'none',
-      'variables': {
-        'webapp_type': 'v2',
-        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
-        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
-        'extra_files': [ 'webapp/background.js' ],
-      },
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v2'
   ],  # end of targets
 
   'conditions': [

[Jamie, 2014/06/20 01:11:15]

Can you have conditions inside targets? It would make this change more obvious
if you removed the old pnacl target and moved its condition to the old v2
target.

[Sergey Ulanov, 2014/06/20 18:43:19]

Done.

     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
-          'target_name': 'remoting_webapp_pnacl',
+          'target_name': 'remoting_webapp_v2',
           'type': 'none',
           'variables': {
-            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.pnacl',
-            'zip_path': '<(PRODUCT_DIR)/remoting-webapp-pnacl.zip',
-            'extra_files': [ 'webapp/background.js' ],
-            'webapp_type': 'v2_pnacl',
+            'webapp_type': 'v2',
+            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
+            'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
           },
           'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_pnacl'
+        },  # end of target 'remoting_webapp_v2'
       ],
     }],
   ],