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

Unified Diff: samples/openglui/emulator/emulator.gyp

Issue 12340036: Android improvements: (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 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 | « samples/openglui/android/custom_rules.xml ('k') | samples/openglui/src/chrome.hex » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samples/openglui/emulator/emulator.gyp
===================================================================
--- samples/openglui/emulator/emulator.gyp (revision 18917)
+++ samples/openglui/emulator/emulator.gyp (working copy)
@@ -16,7 +16,8 @@
'dependencies': [
'../../../runtime/dart-runtime.gyp:emulator_embedder',
'mobile_emulator',
- 'copy_dart_files'
+ 'copy_dart_files',
+ 'decode_png'
]
}
]
@@ -35,6 +36,23 @@
}],
},
{
+ 'target_name': 'decode_png',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'decode',
+ 'inputs': [
+ '../src/chrome.hex'
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/chrome.png',
+ ],
+ 'action': [ 'xxd', '-r', '../src/chrome.hex',
+ '<(PRODUCT_DIR)/chrome.png' ]
+ }
+ ]
+ },
+ {
'target_name': 'mobile_emulator',
'type': 'executable',
'dependencies': [
@@ -53,21 +71,22 @@
'link_settings': {
'libraries': [
'-Wl,--start-group',
+ '-lskia_core',
'-lskia_effects',
+ '-lskia_gr',
'-lskia_images',
- '-lskia_core',
'-lskia_opts',
'-lskia_opts_ssse3',
'-lskia_ports',
'-lskia_sfnt',
+ '-lskia_skgr',
'-lskia_utils',
- '-lskia_gr',
- '-lskia_skgr',
'-Wl,--end-group',
'-lfreetype',
'-lGL',
'-lglut',
'-lGLU',
+ '-lpng',
'-lm',
'-lc' ],
'ldflags': [
« no previous file with comments | « samples/openglui/android/custom_rules.xml ('k') | samples/openglui/src/chrome.hex » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698