Revert 169532 - Beginnings of moving more stuff from build_sdk.py to GYP.

build/all.gyp

 # Copyright (c) 2012 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': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 332 matching lines @@
         {
           'target_name': 'chromium_builder_webrtc',
           'type': 'none',
           'dependencies': [
             'chromium_builder_qa',  # needed for perf pyauto tests
             '../third_party/libjingle/libjingle.gyp:peerconnection_server',
             '../third_party/webrtc/tools/tools.gyp:frame_analyzer',
             '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
           ],
         },  # target_name: chromium_builder_webrtc
-        {
-          'target_name': 'chromium_builder_nacl_sdk',
-          'type': 'none',
-          'dependencies': [
-            '../chrome/chrome.gyp:chrome',
-          ],
-          'conditions': [
-            ['disable_nacl==0 and OS!="win"', {
-              'dependencies': [
-                '../native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp:*',
-              ],
-            }],
-            ['disable_nacl==0 and OS=="win"', {
-              'dependencies': [
-                '../native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp:*',
-                '../chrome/chrome.gyp:chrome_nacl_win64',
-              ],
-            }],
-          ],
-        },  # target_name: chromium_builder_nacl_sdk
       ],  # targets
     }],
     ['OS=="mac"', {
       'targets': [
         {
           # Target to build everything plus the dmg.  We don't put the dmg
           # in the All target because developers really don't need it.
           'target_name': 'all_and_dmg',
           'type': 'none',
           'dependencies': [
@@ skipping 364 matching lines @@
             '../chrome/chrome.gyp:browser_tests_run',
             '../chrome/chrome.gyp:sync_integration_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests
       ],
     }],
   ], # conditions
 }