Disable PNaCl for V2 app

remoting/remoting_client.gypi

Index: remoting/remoting_client.gypi
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index 59da6980c9516fee5fc3666378f81a4dd5d8d30b..cf54377dc3631abb41356e2b6f0dc530e3ddbd47 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -116,6 +116,13 @@
         'remoting_webapp_v1',
         'remoting_webapp_v2',
       ],
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {

[Jamie, 2015/01/23 00:47:16]

Do we need the "untrusted" variable? As it is, setting "disable_nacl = 0" is not
sufficient to cause the nacl version to be built, which doesn't seem right. For
these two variable to work as their name suggests, I feel like we would need two
additional web-app target.

[Sergey Ulanov, 2015/01/23 01:00:16]

This is the condition that's used in other places to build (P)NaCl bits.
disable_nacl and disable_nacl_untrusted are set to 0 by default, so
remoting_webapp_v2_pnacl should be built by default. Setting either disable_nacl
or disable_nacl_untrusted to 1 allows to disable it.

+          'dependencies': [
+            'remoting_webapp_v2_pnacl',
+          ],
+        }]
+      ],
     },  # end of target 'remoting_webapp'
 
     {
@@ -135,26 +142,33 @@
       'variables': {
         'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
         'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
+        'webapp_type': 'v2',
       },
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_nacl.gyp:remoting_client_plugin_nacl',
-          ],
+      '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_v2_pnacl',
+          'type': 'none',
           'variables': {
+            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2_pnacl',
+            'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2_pnacl.zip',
             'webapp_type': 'v2_pnacl',
             'extra_files': [
               'webapp/crd/remoting_client_pnacl.nmf',
               '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
             ],
           },
-        }, {
-          'variables': {
-            'webapp_type': 'v2',
-          },
-        }],
+          'dependencies': [
+            'remoting_nacl.gyp:remoting_client_plugin_nacl',
+          ],
+          'includes': [ 'remoting_webapp.gypi', ],
+        },  # end of target 'remoting_webapp_v2_pnacl'
       ],
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v2'
-  ],  # end of targets
+    }],
+  ],
 }