Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/images.gyp

Issue 1406153015: Remove dependencies on Android's forked decoder libraries (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gyp/codec.gyp ('K') | « gyp/codec.gyp ('k') | gyp/libjpeg.gyp » ('j') | gyp/libjpeg.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3c46ec1a8f0bf659bedc21feea5f1ab9278a5ed9..ad8317a6d643ffd52ad6445cfa879a06834047c1 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -14,7 +14,7 @@
'dependencies': [
'core.gyp:*',
'giflib.gyp:giflib',
- 'libjpeg.gyp:*',
+ 'libjpeg-turbo.gyp:libjpeg-turbo',
'etc1.gyp:libetc1',
'ktx.gyp:libSkKTX',
'libwebp.gyp:libwebp',
@@ -142,7 +142,6 @@
[ 'skia_android_framework == 0', {
'export_dependent_settings': [
'android_deps.gyp:png',
- 'libjpeg.gyp:*'
],
}, {
# The android framework disables these decoders as they are of little use to
« gyp/codec.gyp ('K') | « gyp/codec.gyp ('k') | gyp/libjpeg.gyp » ('j') | gyp/libjpeg.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698