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

Unified Diff: gyp/tools.gyp

Issue 16904003: SkHello for NaCl (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 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 | « Makefile ('k') | platform_tools/nacl/index.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/tools.gyp
===================================================================
--- gyp/tools.gyp (revision 9611)
+++ gyp/tools.gyp (working copy)
@@ -60,14 +60,24 @@
{
'target_name': 'skhello',
'type': 'executable',
- 'sources': [
- '../tools/skhello.cpp',
- ],
'dependencies': [
'skia_lib.gyp:skia_lib',
- 'pdf.gyp:pdf',
- 'flags.gyp:flags',
],
+ 'conditions': [
+ [ 'skia_os == "nacl"', {
+ 'sources': [
+ '../platform_tools/nacl/src/nacl_hello.cpp',
+ ],
+ }, {
+ 'sources': [
+ '../tools/skhello.cpp',
+ ],
+ 'dependencies': [
+ 'pdf.gyp:pdf',
+ 'flags.gyp:flags',
+ ],
+ }],
+ ],
},
{
'target_name': 'skimage',
« no previous file with comments | « Makefile ('k') | platform_tools/nacl/index.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698