Remove legacy CRD application types.

remoting/remoting_client.gypi

Index: remoting/remoting_client.gypi
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index 3d53e39c466e40d08515268f57e00604203b5e55..c6e520e1842d8f0829f7168addea37e7842b5785 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -152,66 +152,37 @@
       ],
     },
     {
-      # GN version: //remoting/webapp:webapp
+      # GN version: //remoting/webapp
       'target_name': 'remoting_webapp',
       'type': 'none',
-      'dependencies': [
-        'remoting_client_credits',
-        'remoting_webapp_v1',
-      ],
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_webapp_v2',
-          ],
-        }]
-      ],
-    },  # end of target 'remoting_webapp'
-
-    {
-      # GN version: //remoting/webapp:webapp_v1
-      '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',
+        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
+        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
+        'webapp_type': 'desktop',
+        'extra_files': [
+          'webapp/crd/remoting_client_pnacl.nmf.jinja2',
+        ],
       },
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v1'
-  ],  # end of targets
-
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          # GN version: //remoting/webapp:webapp_v1
-          'target_name': 'remoting_webapp_v2',
-          'type': 'none',
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'variables': {
-            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
-            'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.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'
+        }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0 and buildtype == "Dev"', {
+          'variables': {
+            'extra_files': [
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
+            ],
+          },
+        }],
       ],
-    }],
-  ],
+      'includes': [ 'remoting_webapp.gypi', ],
+    },  # end of target 'remoting_webapp'
+  ],  # end of targets
 }