diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-12-14 01:31:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-14 01:31:53 +0000 |
| commit | bde5d5dc2e628f4d1cfb9925a202b29303b0df6b (patch) | |
| tree | a586c8795e50eac931b5587d453b2ec5d7972c53 | |
| parent | ecdb686a5cae733ecd914c8bd5fd407b45ee2594 (diff) | |
Revert "Do not build the ktx encoder for android framework"
This reverts commit eeb7137a0b421522de4c21c90fc3208e33e3a5a5.
Reason for revert: well, duh, I guess we'd better update the GYP and Google3 builds...
Original change's description:
> 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>
>
TBR=mtklein@chromium.org,mtklein@google.com,scroggo@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I8da75db31884b5148f7f85a6a0c3e6913b71cfa8
Reviewed-on: https://skia-review.googlesource.com/6021
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | BUILD.gn | 11 | ||||
| -rw-r--r-- | gn/gn_to_bp.py | 1 | ||||
| -rw-r--r-- | src/images/SkImageEncoderPriv.h | 2 |
3 files changed, 2 insertions, 12 deletions
@@ -27,7 +27,6 @@ declare_args() { skia_enable_android_framework_defines = false skia_enable_gpu = true - skia_enable_ktx_encoder = true skia_enable_tools = is_skia_standalone skia_enable_vulkan_debug_layers = is_skia_standalone && is_debug skia_vulkan_sdk = getenv("VULKAN_SDK") @@ -431,14 +430,6 @@ optional("jpeg") { ] } -optional("ktx_encoder") { - enabled = skia_enable_ktx_encoder - public_defines = [ "SK_HAS_KTX_ENCODER" ] - sources = [ - "src/images/SkKTXImageEncoder.cpp", - ] -} - optional("pdf") { enabled = skia_use_zlib @@ -545,7 +536,6 @@ component("skia") { ":gpu", ":hsw", ":jpeg", - ":ktx_encoder", ":none", ":pdf", ":png", @@ -588,6 +578,7 @@ component("skia") { "src/codec/SkSwizzler.cpp", "src/codec/SkWbmpCodec.cpp", "src/images/SkImageEncoder.cpp", + "src/images/SkKTXImageEncoder.cpp", "src/ports/SkDiscardableMemory_none.cpp", "src/ports/SkGlobalInitialization_default.cpp", "src/ports/SkImageGenerator_skia.cpp", diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index c443fb9f0a..39bac2f944 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -109,7 +109,6 @@ cc_library { # We'll run GN to get the main source lists and include directories for Skia. gn_args = { - 'skia_enable_ktx_encoder': 'false', 'skia_enable_vulkan_debug_layers': 'false', 'skia_use_system_expat': 'true', 'skia_use_vulkan': 'true', diff --git a/src/images/SkImageEncoderPriv.h b/src/images/SkImageEncoderPriv.h index 121f2d08ab..36519704b2 100644 --- a/src/images/SkImageEncoderPriv.h +++ b/src/images/SkImageEncoderPriv.h @@ -28,7 +28,7 @@ #define SkEncodeImageAsWEBP(...) false #endif -#ifdef SK_HAS_KTX_ENCODER +#ifndef SK_BUILD_FOR_ANDROID_FRAMEWORK bool SkEncodeImageAsKTX(SkWStream*, const SkPixmap&); #else #define SkEncodeImageAsKTX(...) false |