Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: ppapi/ppapi_internal.gyp

Issue 10565012: Revert 142482 - Add untrusted NaCl build for PPAPI proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/native_client/native_client.gyp ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/ppapi_internal.gyp
===================================================================
--- ppapi/ppapi_internal.gyp (revision 142493)
+++ ppapi/ppapi_internal.gyp (working copy)
@@ -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': [
- '..',
- ],
- },
- },
- ]
}
« no previous file with comments | « ppapi/native_client/native_client.gyp ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698