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

Side by Side Diff: ppapi/ppapi_tests.gypi

Issue 7341001: Rollback r90712 (which was a partial rollback of r90660) to re-enable building (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 5 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 | « no previous file | no next file » | 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) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'ppapi_example', 8 'target_name': 'ppapi_example',
9 'dependencies': [ 9 'dependencies': [
10 'ppapi.gyp:ppapi_cpp' 10 'ppapi.gyp:ppapi_cpp'
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 'proxy/ppapi_proxy_test.h', 191 'proxy/ppapi_proxy_test.h',
192 'proxy/ppp_instance_proxy_test.cc', 192 'proxy/ppp_instance_proxy_test.cc',
193 'proxy/serialized_var_unittest.cc', 193 'proxy/serialized_var_unittest.cc',
194 ], 194 ],
195 }, 195 },
196 ], 196 ],
197 197
198 'conditions': [ 198 'conditions': [
199 # NOTE: the PPAPI examples fail to build on mac & windows. 199 # NOTE: the PPAPI examples fail to build on mac & windows.
200 # http://code.google.com/p/chromium/issues/detail?id=54005 tracks mac. 200 # http://code.google.com/p/chromium/issues/detail?id=54005 tracks mac.
201 # TODO(ppapi authors): Make the examples build on Windows as well. In 201 ['OS!="mac"', {
202 # particular previous attempts have failed because the Win(clobber) and
203 # WinShared(dbg) builds try to build all, import *.gyp:*, and "all" becomes
204 # a direct dependent of ppapi_example_skeleton, making it a shared_library,
205 # and confusing the build system into failure.
206 ['OS!="win" and OS!="mac"', {
207 'targets': [ 202 'targets': [
208 { 203 {
209 'target_name': 'ppapi_example_skeleton', 204 'target_name': 'ppapi_example_skeleton',
205 'suppress_wildcard': 1,
210 'type': 'none', 206 'type': 'none',
211 'direct_dependent_settings': { 207 'direct_dependent_settings': {
212 'product_name': '>(_target_name)', 208 'product_name': '>(_target_name)',
213 'conditions': [ 209 'conditions': [
214 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 210 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
215 'cflags': ['-fvisibility=hidden'], 211 'cflags': ['-fvisibility=hidden'],
216 'type': 'shared_library', 212 'type': 'shared_library',
217 # -gstabs, used in the official builds, causes an ICE. Simply re move 213 # -gstabs, used in the official builds, causes an ICE. Simply re move
218 # it. 214 # it.
219 'cflags!': ['-gstabs'], 215 'cflags!': ['-gstabs'],
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 ], 326 ],
331 'sources': [ 327 'sources': [
332 'examples/gles2/gles2.cc', 328 'examples/gles2/gles2.cc',
333 'examples/gles2/testdata.h', 329 'examples/gles2/testdata.h',
334 ], 330 ],
335 }, 331 },
336 ], 332 ],
337 }] 333 }]
338 ] 334 ]
339 } 335 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698