Revert 142482 - Add untrusted NaCl build for PPAPI proxy.

This patch refactors ppapi_shared.gypi and ppapi_proxy.gypi into proper includes, adds ppapi_shared_untrusted and ppapi_proxy_untrusted .gyp files, and integrates them into the nacl_irt build (ppapi/native_client/native_client.gyp). In order to build without link errors, it includes our plugin side initialization of PluginDispatcher, and a PpapiPluginMain definition. When the 'build_ppapi_ipc_proxy_untrusted' gyp flag is set to '1', this will build a working NaCl IRT using the Chrome IPC proxy.
BUG=116317
TEST=compiles, runs HelloWorld and GetURL SDK examples.

Review URL: https://chromiumcodereview.appspot.com/10546140

TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10565012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142494 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 62 deletions

diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index 4ad96e3..6bf0565 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -29,65 +29,4 @@
     'ppapi_shared.gypi',
     'ppapi_tests.gypi',
   ],
-  'targets': [
-    {
-      'target_name': 'ppapi_shared',
-      'type': '<(component)',
-      'variables': {
-        'ppapi_shared_target': 1,
-      },
-      'dependencies': [
-        'ppapi.gyp:ppapi_c',
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
-        '../gpu/gpu.gyp:command_buffer_client',
-        '../gpu/gpu.gyp:gles2_implementation',
-        '../net/net.gyp:net',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icuuc',
-        # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
-        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-        '../ui/surface/surface.gyp:surface',
-      ],
-      'export_dependent_settings': [
-        '../base/base.gyp:base',
-        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
-            ],
-          },
-        }],
-      ],
-    },
-    {
-      'target_name': 'ppapi_proxy',
-      'type': '<(component)',
-      'variables': {
-        'ppapi_proxy_target': 1,
-      },
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../gpu/gpu.gyp:gles2_implementation',
-        '../gpu/gpu.gyp:gpu_ipc',
-        '../ipc/ipc.gyp:ipc',
-        '../skia/skia.gyp:skia',
-        '../ui/surface/surface.gyp:surface',
-        'ppapi.gyp:ppapi_c',
-        'ppapi_shared',
-      ],
-      'all_dependent_settings': {
-        'include_dirs': [
-           '..',
-        ],
-      },
-    },
-  ]
 }