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..abfc4dcb9f91b0915f5fd8b702dc159ee5c4ee11 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -94,13 +94,6 @@
         'remoting_webapp_v1',
         'remoting_webapp_v2',
       ],
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_webapp_pnacl',
-          ],
-        }],
-      ],
     },  # end of target 'remoting_webapp'
 
     {
@@ -118,31 +111,29 @@
       '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': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          'target_name': 'remoting_webapp_pnacl',
-          'type': 'none',
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
+          'dependencies': [
+            'remoting_nacl.gyp:remoting_client_plugin_nacl',
+          ],
           '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',
+            'extra_files': [
+              'webapp/remoting_client_pnacl.nmf',
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
+            ],
+          },
+        }, {
+          'variables': {
+            'webapp_type': 'v2',
           },
-          'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_pnacl'
+        }],
       ],
-    }],
-  ],
-
+      'includes': [ 'remoting_webapp.gypi', ],
+    },  # end of target 'remoting_webapp_v2'
+  ],  # end of targets
 }