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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/tests.gyp

Issue 235883015: Generate tests/Android.mk from gyp (Closed) Base URL: https://skia.googlesource.com/skia.git@generate
Patch Set: Created 6 years, 8 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
« Android.mk ('K') | « gyp/apptype_console.gypi ('k') | platform_tools/android/bin/android_framework_gyp.py » ('j') | platform_tools/android/bin/android_framework_gyp.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/tests.gyp
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index d0a898c41e4d3faeca3a51b3cc4afad6d94262a2..7acef4e8093b38098dcf16b81e783e02ef9c1608 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -15,6 +15,17 @@
'../tests/skia_test.cpp',
],
'conditions': [
+ [ 'skia_android_framework == 1', {
+ 'libraries': [
+ '-lskia',
+ '-lcutils',
+ 'stlport_static.a',
djsollen 2014/04/28 13:52:23 are we sure that is the right way to include stlpo
scroggo 2014/04/28 14:37:24 This matches what the makefile already stated.
+ ],
+ 'libraries!': [
+ '-lz',
+ '-llog',
+ ],
+ }],
[ 'skia_gpu == 1', {
'include_dirs': [
'../src/gpu',
« Android.mk ('K') | « gyp/apptype_console.gypi ('k') | platform_tools/android/bin/android_framework_gyp.py » ('j') | platform_tools/android/bin/android_framework_gyp.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698