From 95ada6ee732f9b3a335d6acb3cdba0bc97b5e979 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Wed, 14 Dec 2016 10:33:10 -0500 Subject: Remove SkKTXImageEncoder It escaped the chopping block when we deleted the decoder, but it is currently untested and unused as far as we know. In addition to removing effectively unsupported code, this simplifies build file changes (i.e. don't build it on Android framework, but build it elsewhere) as we narrow our build systems down to one. Change-Id: I3b960fdcc369fb947be282933ddba48e407ab3ad Reviewed-on: https://skia-review.googlesource.com/6031 Reviewed-by: Robert Phillips Reviewed-by: Mike Klein Commit-Queue: Leon Scroggins --- gyp/images.gyp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gyp') diff --git a/gyp/images.gyp b/gyp/images.gyp index efeb3d2335..da03e6f562 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -15,7 +15,6 @@ 'core.gyp:*', 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', 'etc1.gyp:libetc1', - 'ktx.gyp:libSkKTX', 'libpng.gyp:libpng', 'libwebp.gyp:libwebp', 'utils.gyp:utils', @@ -30,7 +29,6 @@ '../src/image/', ], 'sources': [ - '../src/images/SkKTXImageEncoder.cpp', '../src/images/SkWEBPImageEncoder.cpp', '../src/images/SkJPEGImageEncoder.cpp', '../src/images/SkPNGImageEncoder.cpp', @@ -66,15 +64,6 @@ 'dependencies': [ 'libpng.gyp:libpng', ], - 'conditions': [ - [ 'skia_android_framework == 1', { - # The android framework disables these decoders as they are of little use to - # Java applications that can't take advantage of the compressed formats. - 'sources!': [ - '../src/images/SkKTXImageEncoder.cpp', - ], - }], - ], }], [ 'skia_os == "ios"', { 'include_dirs': [ -- cgit v1.2.3