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

Side by Side Diff: ppapi/ppapi_internal.gyp

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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 | « net/net.gyp ('k') | ppapi/ppapi_shared.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) 2012 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': [
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'ppapi.gyp:ppapi_c', 45 'ppapi.gyp:ppapi_c',
46 '../base/base.gyp:base', 46 '../base/base.gyp:base',
47 '../base/base.gyp:base_i18n', 47 '../base/base.gyp:base_i18n',
48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
49 '../build/temp_gyp/googleurl.gyp:googleurl', 49 '../build/temp_gyp/googleurl.gyp:googleurl',
50 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 50 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
51 '../gpu/gpu.gyp:command_buffer_client', 51 '../gpu/gpu.gyp:command_buffer_client',
52 '../gpu/gpu.gyp:gles2_implementation', 52 '../gpu/gpu.gyp:gles2_implementation',
53 '../media/media.gyp:shared_memory_support', 53 '../media/media.gyp:shared_memory_support',
54 '../skia/skia.gyp:skia', 54 '../skia/skia.gyp:skia',
55 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
56 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
55 '../third_party/icu/icu.gyp:icuuc', 57 '../third_party/icu/icu.gyp:icuuc',
56 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
57 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
58 '../ui/surface/surface.gyp:surface', 58 '../ui/surface/surface.gyp:surface',
59 ], 59 ],
60 'export_dependent_settings': [ 60 'export_dependent_settings': [
61 '../base/base.gyp:base', 61 '../base/base.gyp:base',
62 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 62 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
63 ], 63 ],
64 'conditions': [ 64 'conditions': [
65 ['OS=="mac"', { 65 ['OS=="mac"', {
66 'link_settings': { 66 'link_settings': {
67 'libraries': [ 67 'libraries': [
68 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 68 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
69 ], 69 ],
70 }, 70 },
71 }], 71 }],
72 ], 72 ],
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 'ppapi_proxy_target': 1, 105 'ppapi_proxy_target': 1,
106 }, 106 },
107 'dependencies': [ 107 'dependencies': [
108 '../base/base.gyp:base', 108 '../base/base.gyp:base',
109 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 109 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
110 '../gpu/gpu.gyp:gles2_implementation', 110 '../gpu/gpu.gyp:gles2_implementation',
111 '../gpu/gpu.gyp:gpu_ipc', 111 '../gpu/gpu.gyp:gpu_ipc',
112 '../media/media.gyp:shared_memory_support', 112 '../media/media.gyp:shared_memory_support',
113 '../ipc/ipc.gyp:ipc', 113 '../ipc/ipc.gyp:ipc',
114 '../skia/skia.gyp:skia', 114 '../skia/skia.gyp:skia',
115 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
116 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
115 '../third_party/icu/icu.gyp:icuuc', 117 '../third_party/icu/icu.gyp:icuuc',
116 '../third_party/icu/icu.gyp:icui18n', 118 '../third_party/icu/icu.gyp:icui18n',
117 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
118 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
119 '../ui/surface/surface.gyp:surface', 119 '../ui/surface/surface.gyp:surface',
120 'ppapi.gyp:ppapi_c', 120 'ppapi.gyp:ppapi_c',
121 'ppapi_shared', 121 'ppapi_shared',
122 'ppapi_ipc', 122 'ppapi_ipc',
123 ], 123 ],
124 'all_dependent_settings': { 124 'all_dependent_settings': {
125 'include_dirs': [ 125 'include_dirs': [
126 '..', 126 '..',
127 ], 127 ],
128 }, 128 },
(...skipping 15 matching lines...) Expand all
144 'ppapi_proxy_target': 1, 144 'ppapi_proxy_target': 1,
145 }, 145 },
146 'dependencies': [ 146 'dependencies': [
147 '../base/base.gyp:base', 147 '../base/base.gyp:base',
148 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 148 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
149 '../gpu/gpu.gyp:gles2_implementation', 149 '../gpu/gpu.gyp:gles2_implementation',
150 '../gpu/gpu.gyp:gpu_ipc', 150 '../gpu/gpu.gyp:gpu_ipc',
151 '../media/media.gyp:shared_memory_support', 151 '../media/media.gyp:shared_memory_support',
152 '../ipc/ipc.gyp:ipc', 152 '../ipc/ipc.gyp:ipc',
153 '../skia/skia.gyp:skia', 153 '../skia/skia.gyp:skia',
154 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
155 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
154 '../third_party/icu/icu.gyp:icuuc', 156 '../third_party/icu/icu.gyp:icuuc',
155 '../third_party/icu/icu.gyp:icui18n', 157 '../third_party/icu/icu.gyp:icui18n',
156 # TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
157 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
158 '../ui/surface/surface.gyp:surface', 158 '../ui/surface/surface.gyp:surface',
159 'ppapi.gyp:ppapi_c', 159 'ppapi.gyp:ppapi_c',
160 'ppapi_shared', 160 'ppapi_shared',
161 ], 161 ],
162 'all_dependent_settings': { 162 'all_dependent_settings': {
163 'include_dirs': [ 163 'include_dirs': [
164 '..', 164 '..',
165 ], 165 ],
166 }, 166 },
167 # Disable c4267 warnings until we fix size_t to int truncations. 167 # Disable c4267 warnings until we fix size_t to int truncations.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 }, 235 },
236 'configurations': { 236 'configurations': {
237 'Common_Base': { 237 'Common_Base': {
238 'msvs_target_platform': 'x64', 238 'msvs_target_platform': 'x64',
239 }, 239 },
240 }, 240 },
241 }], 241 }],
242 }], 242 }],
243 ], 243 ],
244 } 244 }
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698