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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/native_client/native_client.gyp ('k') | ppapi/ppapi_proxy.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
11 # Linux shared libraries should always be built -fPIC. 11 # Linux shared libraries should always be built -fPIC.
(...skipping 10 matching lines...) Expand all
22 'cflags/': [['include', '^-fvisibility=hidden$']], 22 'cflags/': [['include', '^-fvisibility=hidden$']],
23 }], 23 }],
24 ], 24 ],
25 }, 25 },
26 'includes': [ 26 'includes': [
27 'ppapi_sources.gypi', 27 'ppapi_sources.gypi',
28 'ppapi_proxy.gypi', 28 'ppapi_proxy.gypi',
29 'ppapi_shared.gypi', 29 'ppapi_shared.gypi',
30 'ppapi_tests.gypi', 30 'ppapi_tests.gypi',
31 ], 31 ],
32 'targets': [
33 {
34 'target_name': 'ppapi_shared',
35 'type': '<(component)',
36 'variables': {
37 'ppapi_shared_target': 1,
38 },
39 'dependencies': [
40 'ppapi.gyp:ppapi_c',
41 '../base/base.gyp:base',
42 '../base/base.gyp:base_i18n',
43 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
44 '../build/temp_gyp/googleurl.gyp:googleurl',
45 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
46 '../gpu/gpu.gyp:command_buffer_client',
47 '../gpu/gpu.gyp:gles2_implementation',
48 '../net/net.gyp:net',
49 '../skia/skia.gyp:skia',
50 '../third_party/icu/icu.gyp:icuuc',
51 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
52 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
53 '../ui/surface/surface.gyp:surface',
54 ],
55 'export_dependent_settings': [
56 '../base/base.gyp:base',
57 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
58 ],
59 'conditions': [
60 ['OS=="mac"', {
61 'link_settings': {
62 'libraries': [
63 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
64 ],
65 },
66 }],
67 ],
68 },
69 {
70 'target_name': 'ppapi_proxy',
71 'type': '<(component)',
72 'variables': {
73 'ppapi_proxy_target': 1,
74 },
75 'dependencies': [
76 '../base/base.gyp:base',
77 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
78 '../gpu/gpu.gyp:gles2_implementation',
79 '../gpu/gpu.gyp:gpu_ipc',
80 '../ipc/ipc.gyp:ipc',
81 '../skia/skia.gyp:skia',
82 '../ui/surface/surface.gyp:surface',
83 'ppapi.gyp:ppapi_c',
84 'ppapi_shared',
85 ],
86 'all_dependent_settings': {
87 'include_dirs': [
88 '..',
89 ],
90 },
91 },
92 ]
93 } 32 }
OLDNEW
« 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