Enable PNaCl for V2 CRD app

BUG=469763 Review URL: https://codereview.chromium.org/1022983003 Cr-Commit-Position: refs/heads/master@{#321815}
hylschwy · Mar 23, 2015 · c61851d · c61851d
1 parent d83bdf0
commit c61851d
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
@@ -129,12 +129,11 @@
       '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',
           ],
         }]
       ],
@@ -150,24 +149,13 @@
       },
       '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',
@@ -191,7 +179,7 @@
             }],
           ],
           'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_v2_pnacl'
+        },  # end of target 'remoting_webapp_v2'
       ],
     }],
   ],