Enable PNaCl for V2 CRD app

remoting/remoting_client.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //remoting/client/plugin
       'target_name': 'remoting_client_plugin',
       'type': 'static_library',
@@ skipping 111 matching lines @@
           ],
         },
       ],  # end of actions
     },  # end of target 'remoting_webapp_html'
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
         'remoting_webapp_v1',
-        'remoting_webapp_v2',
       ],
       'conditions': [
         ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'dependencies': [
-            'remoting_webapp_v2_pnacl',
+            'remoting_webapp_v2',
           ],
         }]
       ],
     },  # end of target 'remoting_webapp'
 
     {
       'target_name': 'remoting_webapp_v1',
       'type': 'none',
       'variables': {
         'webapp_type': 'v1',
         'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
         'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
       },
       'includes': [ 'remoting_webapp.gypi', ],
     },  # end of target 'remoting_webapp_v1'
-
-    {
-      'target_name': 'remoting_webapp_v2',
-      'type': 'none',
-      'variables': {
-        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
-        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
-        'webapp_type': 'v2',
-      },
-      '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',
+          'target_name': 'remoting_webapp_v2',
           '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.jinja2',
               '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
             ],
           },
           'dependencies': [
             'remoting_nacl.gyp:remoting_client_plugin_nacl',
           ],
           'conditions': [
             ['buildtype == "Dev"', {
               'variables': {
                 'extra_files': [
                   '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
                 ],
               },
             }],
           ],
           'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_v2_pnacl'
+        },  # end of target 'remoting_webapp_v2'
       ],
     }],
   ],
 }