diff options
| author |  Leon Scroggins III <scroggo@google.com> | 2016-12-13 16:32:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-13 22:13:54 +0000 |
| commit | eeb7137a0b421522de4c21c90fc3208e33e3a5a5 (patch) | |
| tree | bc3cc5a15b768bec975266eee8956a568b8041a8 /src/images | |
| parent | 04e10da8362a0dcabd795a4ad53f617719ca0d20 (diff) | |
Do not build the ktx encoder for android framework
Move SkKTXImageEncoder.cpp into an optional block, and disable that
block for the android framework. Use a new define to determine whether
to define the entry point, rather than using
SK_BUILD_FOR_ANDROID_FRAMEWORK.
Change-Id: I41103459135af744cf5715f27783c63dc37a7ad1
Reviewed-on: https://skia-review.googlesource.com/5982
Commit-Queue: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageEncoderPriv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h index 36519704b2..121f2d08ab 100644 --- a/src/images/SkImageEncoderPriv.h +++ b/src/images/SkImageEncoderPriv.h @@ -28,7 +28,7 @@ #define SkEncodeImageAsWEBP(...) false #endif -#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK +#ifdef SK_HAS_KTX_ENCODER bool SkEncodeImageAsKTX(SkWStream*, const SkPixmap&); #else #define SkEncodeImageAsKTX(...) false |