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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/bench.gyp

Issue 282053002: Generate bench/Android.mk from gyp. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselines
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« bench/ResultsWriter.h ('K') | « bench/benchmain.cpp ('k') | include/utils/SkJSONCPP.h » ('j') | include/utils/SkJSONCPP.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/bench.gyp
diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 9e8d1d714b37aa9a2bbe1c817d674274916bee6b..f8b5ceaa36829bfcb94a8138804db469d2cedd80 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -33,6 +33,19 @@
],
},
],
+ ['skia_android_framework == 1',
+ {
+ 'libraries': [
+ '-lskia',
+ '-lcutils',
+ ],
+ # FIXME (scroggo): JSON is disabled in Android framework until we
+ # solve skbug.com/2448
+ 'dependencies!' : [
+ 'jsoncpp.gyp:jsoncpp',
+ ],
+ },
+ ],
],
'includes': [
'bench.gypi',
« bench/ResultsWriter.h ('K') | « bench/benchmain.cpp ('k') | include/utils/SkJSONCPP.h » ('j') | include/utils/SkJSONCPP.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698