diff options
| author |  jvanverth <jvanverth@google.com> | 2016-06-16 09:52:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-16 09:52:35 -0700 |
| commit | c7027ab03f2e8bab4c74bc1b047642622d3d682b (patch) | |
| tree | 72baa4e6345d6e3bbdb2b0165130a637a9778f19 /gyp/viewer.gyp | |
| parent | c4ce6b592487305de251bbebaf8eeee38371b877 (diff) | |
Add samples to Viewer.
This adds support with animation, assuming the sample has
implemented onAnimate. Event handling has not been
implemented.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2056343004
Committed: https://skia.googlesource.com/skia/+/76963e73704a42a18c29d6fbdcccb566e5c67658
Review-Url: https://codereview.chromium.org/2056343004
Diffstat (limited to 'gyp/viewer.gyp')
| -rw-r--r-- | gyp/viewer.gyp | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp index 1013e070ae..012281a68e 100644 --- a/gyp/viewer.gyp +++ b/gyp/viewer.gyp @@ -14,26 +14,41 @@ 'type': 'executable', 'includes' : [ 'gmslides.gypi', + 'samples.gypi', ], 'include_dirs': [ '../bench', '../gm', - '../include/views', '../include/private', '../src/core', '../src/effects', '../src/gpu', - '../src/images', '../src/image', + '../src/images', + '../src/pathops', '../src/views/unix', '../tools/timer', ], 'sources': [ '../gm/gm.cpp', + '<!@(python find.py ../tools/viewer "*.cpp")', + + # views (subset of files for the Android build) + '../src/views/SkEvent.cpp', + '../src/views/SkEventSink.cpp', + '../src/views/SkOSMenu.cpp', + '../src/views/SkTagList.cpp', + '../src/views/SkTagList.h', '../src/views/SkTouchGesture.cpp', + '../src/views/SkView.cpp', + '../src/views/SkViewPriv.cpp', + '../src/views/SkViewPriv.h', '../src/views/unix/keysym2ucs.c', - '<!@(python find.py ../tools/viewer "*.cpp")', ], + 'sources!': [ + '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile + '../samplecode/SampleFontCache.cpp', #relies on pthread.h + ], 'dependencies': [ 'flags.gyp:flags', 'gputest.gyp:skgputest', @@ -52,6 +67,11 @@ 'android_deps.gyp:Android_EntryPoint', 'android_deps.gyp:native_app_glue', ], + # views depends on SkOSWindow_android, which we don't want to include + # so we only include the minimum set of views files in sources + 'dependencies!': [ + 'views.gyp:views', + ], 'link_settings': { 'libraries': [ '-landroid', @@ -66,11 +86,13 @@ }, }], ['skia_os != "android"', { - 'sources/': [ ['exclude', '_android.(h|cpp)$'], + 'sources/': [ + ['exclude', '_android.(h|cpp)$'], + ['exclude', 'src/views'], ], }], ['skia_os != "linux"', { - 'sources/': [ + 'sources/': [ ['exclude', '_unix.(h|cpp)$'], ['exclude', 'keysym2ucs.c'], ], |