AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable bitmap decoders for GPU specific formats on Android framework

Browse Source 
R=reed@google.com, robertphillips@google.com, scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/510913003
This commit is contained in:
djsollen 2014-08-28 05:41:21 -07:00 committed by Commit bot
parent 7b3d5ee72c
commit 38e44b06b2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gyp/images.gyp
View File

@ -14,13 +14,6 @@
'libwebp.gyp:libwebp',
'utils.gyp:utils',
],
'conditions': [
[ 'skia_android_framework == 0', {
'export_dependent_settings': [
'libjpeg.gyp:*',
],
}],
],
'include_dirs': [
'../include/images',
'../src/lazy',
@ -141,7 +134,16 @@
'conditions': [
[ 'skia_android_framework == 0', {
'export_dependent_settings': [
'android_deps.gyp:png'
'android_deps.gyp:png',
'libjpeg.gyp:*'
],
}, {
# 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/SkImageDecoder_pkm.cpp',
'../src/images/SkImageDecoder_ktx.cpp',
'../src/images/SkImageDecoder_astc.cpp',
],
}],
],