diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 17:56:43 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-16 17:56:43 +0000 |
| commit | 25c1066e4d23cf7cb1795c78987f4fde08282b46 (patch) | |
| tree | 45da3191440170d80460ad42ef2572cdaddf0725 /gyp | |
| parent | a783559c26f8d8554be1fc50877da02e86301c2e (diff) | |
Generate gm/Android.mk, minus JSON.
When running gyp_to_android.py, generate the makefile for gm.
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
gm/gm_expectations.cpp:
gm/gm_expectations.h:
gm/gmmain.cpp:
Remove all json functionality when SK_BUILD_JSON_WRITER is not defined.
This flag is not defined when SK_BUILD_FOR_ANDROID is defined.
gyp/gm.gyp:
Depend on skia and cutils.
platform_tools/android/bin/gyp_to_android.py:
Generate gm/Android.mk.
platform_tools/android/gyp_gen/makefile_writer.py:
Build gm/Android.mk when building external/skia.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
BUG=skia:2448
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/281303003
git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gm.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gyp/gm.gyp b/gyp/gm.gyp index 3533aa5ce9..a4ec604fbf 100644 --- a/gyp/gm.gyp +++ b/gyp/gm.gyp @@ -52,6 +52,12 @@ 'pdf.gyp:pdf', ], 'conditions': [ + ['skia_android_framework', { + 'libraries': [ + '-lskia', + '-lcutils', + ], + }], ['skia_run_pdfviewer_in_gm or skia_poppler_enabled', { 'sources': [ '../src/utils/SkPDFRasterizer.cpp', |