diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-06-12 12:51:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-12 12:51:44 -0700 |
| commit | 030dc847dc497b011c417dc6694e8b6de290895f (patch) | |
| tree | d943ac79c22575874932e4100e3dd91dccac168f /gyp | |
| parent | 6eba3054229a9b656e372c3b80003f442a5d6161 (diff) | |
Visual bench on native android
BUG=skia:
Review URL: https://codereview.chromium.org/1164403002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/most.gyp | 17 | ||||
| -rw-r--r-- | gyp/visualbench.gyp | 15 |
2 files changed, 28 insertions, 4 deletions
diff --git a/gyp/most.gyp b/gyp/most.gyp index d674802238..d615d3896a 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -30,14 +30,27 @@ 'visualbench.gyp:visualbench', ], 'conditions': [ + [ 'skia_gpu == 0', { + 'dependencies!': [ + 'visualbench.gyp:visualbench' + ] + }], [ 'skia_gpu == 0 or skia_os == "android"', { 'dependencies!': [ 'example.gyp:HelloWorld', - 'visualbench.gyp:visualbench', ], }], ['skia_os == "android"', { - 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], + 'dependencies': [ + 'android_system.gyp:SampleApp_APK', + ], + 'conditions': [ + [ 'skia_gpu == 1', { + 'dependencies': [ + 'android_system.gyp:VisualBench_APK', + ], + }], + ], }], ['skia_os == "ios"', { 'dependencies!': [ diff --git a/gyp/visualbench.gyp b/gyp/visualbench.gyp index ebc34e2852..94c9b7339a 100644 --- a/gyp/visualbench.gyp +++ b/gyp/visualbench.gyp @@ -17,11 +17,9 @@ 'sources': [ '../tools/VisualBench.h', '../tools/VisualBench.cpp', - '../src/images/SkForceLinking.cpp', ], 'dependencies': [ 'flags.gyp:flags_common', - 'images.gyp:images', 'skia_lib.gyp:skia_lib', 'tools.gyp:proc_stats', 'tools.gyp:timer', @@ -56,6 +54,19 @@ '../example/mac/HelloWorld.xib' ], }], + [ 'skia_os == "android"', { + 'dependencies': [ + 'android_deps.gyp:Android_VisualBench', + 'android_deps.gyp:native_app_glue', + ], + 'link_settings': { + 'libraries': [ + '-landroid', + '-lGLESv2', + '-lEGL', + ], + }, + }], ], }, ], |