diff options
| -rw-r--r-- | DEPS | 24 | ||||
| -rw-r--r-- | gyp/libjpeg.gyp | 6 | ||||
| -rw-r--r-- | gyp/libwebp.gyp | 109 |
3 files changed, 80 insertions, 59 deletions
@@ -8,22 +8,24 @@ use_relative_paths = True # See third_party/externals/README # deps = { - "third_party/externals/angle" : "http://angleproject.googlecode.com/svn/trunk@1268", - "third_party/externals/freetype" : "https://android.googlesource.com/platform/external/freetype.git", - "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1643", - "third_party/externals/libjpeg" : "http://src.chromium.org/svn/trunk/src/third_party/libjpeg@125399", - "third_party/externals/jsoncpp" : "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248", - "third_party/externals/jsoncpp-chromium" : "http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@125399", - "third_party/externals/libwebp" : "http://src.chromium.org/svn/trunk/src/third_party/libwebp@186718", + # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199 + # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279) + "third_party/externals/angle" : "https://chromium.googlesource.com/external/angleproject.git@36cced4a9b48cc1e654fbb27477f12fb77b63c91", + "third_party/externals/freetype" : "https://android.googlesource.com/platform/external/freetype.git@android-4.2.2_r1.2", + "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@8f42386eafcd7ddf1947cab2808a76c315ff30cc", + "third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3", + "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@ab1e40f3bce061ea6f9bdc60351d6cde2a4f872b", + "third_party/externals/jsoncpp-chromium" : "https://chromium.googlesource.com/chromium/src/third_party/jsoncpp.git@41239939c0c60481f34887d52c038facf05f5533", + "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@0.3.0", "third_party/externals/podofo" : "https://skia.googlesource.com/third_party/podofo.git@skia_ext", } deps_os = { "android": { - "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git", - "platform_tools/android/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git", - "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git", - "platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git", + "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2", + "platform_tools/android/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git@android-4.2.2_r1.2", + "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git@android-4.2.2_r1.2", + "platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git@android-4.2.2_r1.2", }, } diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index da2b9deadb..c365941c59 100644 --- a/gyp/libjpeg.gyp +++ b/gyp/libjpeg.gyp @@ -35,6 +35,10 @@ 'target_name': 'libjpeg', 'type': 'static_library', 'sources': [ + # we currently build skia's version of libjpeg-turbo without + # SIMD optimizations for simplicity + '../third_party/externals/libjpeg/jsimd_none.c', + '../third_party/externals/libjpeg/jcapimin.c', '../third_party/externals/libjpeg/jcapistd.c', '../third_party/externals/libjpeg/jccoefct.c', @@ -78,6 +82,7 @@ '../third_party/externals/libjpeg/jidctflt.c', '../third_party/externals/libjpeg/jidctfst.c', '../third_party/externals/libjpeg/jidctint.c', + '../third_party/externals/libjpeg/jidctred.c', '../third_party/externals/libjpeg/jinclude.h', '../third_party/externals/libjpeg/jmemmgr.c', '../third_party/externals/libjpeg/jmemnobs.c', @@ -85,6 +90,7 @@ '../third_party/externals/libjpeg/jmorecfg.h', '../third_party/externals/libjpeg/jpegint.h', '../third_party/externals/libjpeg/jpeglib.h', + '../third_party/externals/libjpeg/jpeglibmangler.h', '../third_party/externals/libjpeg/jquant1.c', '../third_party/externals/libjpeg/jquant2.c', '../third_party/externals/libjpeg/jutils.c', diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index e20f0049b0..a2f5cfdcd4 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -16,17 +16,27 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dec/alpha.c', - '../third_party/externals/libwebp/dec/buffer.c', - '../third_party/externals/libwebp/dec/frame.c', - '../third_party/externals/libwebp/dec/idec.c', - '../third_party/externals/libwebp/dec/io.c', - '../third_party/externals/libwebp/dec/layer.c', - '../third_party/externals/libwebp/dec/quant.c', - '../third_party/externals/libwebp/dec/tree.c', - '../third_party/externals/libwebp/dec/vp8.c', - '../third_party/externals/libwebp/dec/vp8l.c', - '../third_party/externals/libwebp/dec/webp.c', + '../third_party/externals/libwebp/src/dec/alpha.c', + '../third_party/externals/libwebp/src/dec/buffer.c', + '../third_party/externals/libwebp/src/dec/frame.c', + '../third_party/externals/libwebp/src/dec/idec.c', + '../third_party/externals/libwebp/src/dec/io.c', + '../third_party/externals/libwebp/src/dec/layer.c', + '../third_party/externals/libwebp/src/dec/quant.c', + '../third_party/externals/libwebp/src/dec/tree.c', + '../third_party/externals/libwebp/src/dec/vp8.c', + '../third_party/externals/libwebp/src/dec/vp8l.c', + '../third_party/externals/libwebp/src/dec/webp.c', + ], + }, + { + 'target_name': 'libwebp_demux', + 'type': 'static_library', + 'include_dirs': [ + '../third_party/externals/libwebp', + ], + 'sources': [ + '../third_party/externals/libwebp/src/demux/demux.c', ], }, { @@ -36,15 +46,15 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dsp/cpu.c', - '../third_party/externals/libwebp/dsp/dec.c', - '../third_party/externals/libwebp/dsp/dec_sse2.c', - '../third_party/externals/libwebp/dsp/enc.c', - '../third_party/externals/libwebp/dsp/enc_sse2.c', - '../third_party/externals/libwebp/dsp/lossless.c', - '../third_party/externals/libwebp/dsp/upsampling.c', - '../third_party/externals/libwebp/dsp/upsampling_sse2.c', - '../third_party/externals/libwebp/dsp/yuv.c', + '../third_party/externals/libwebp/src/dsp/cpu.c', + '../third_party/externals/libwebp/src/dsp/dec.c', + '../third_party/externals/libwebp/src/dsp/dec_sse2.c', + '../third_party/externals/libwebp/src/dsp/enc.c', + '../third_party/externals/libwebp/src/dsp/enc_sse2.c', + '../third_party/externals/libwebp/src/dsp/lossless.c', + '../third_party/externals/libwebp/src/dsp/upsampling.c', + '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', + '../third_party/externals/libwebp/src/dsp/yuv.c', ], 'conditions': [ ['skia_os == "android"', { @@ -63,7 +73,7 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/dsp/dec_neon.c', + '../third_party/externals/libwebp/src/dsp/dec_neon.c', ], # behavior similar dsp_neon.c.neon in an Android.mk 'cflags!': [ @@ -82,22 +92,23 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/enc/alpha.c', - '../third_party/externals/libwebp/enc/analysis.c', - '../third_party/externals/libwebp/enc/backward_references.c', - '../third_party/externals/libwebp/enc/config.c', - '../third_party/externals/libwebp/enc/cost.c', - '../third_party/externals/libwebp/enc/filter.c', - '../third_party/externals/libwebp/enc/frame.c', - '../third_party/externals/libwebp/enc/histogram.c', - '../third_party/externals/libwebp/enc/iterator.c', - '../third_party/externals/libwebp/enc/layer.c', - '../third_party/externals/libwebp/enc/picture.c', - '../third_party/externals/libwebp/enc/quant.c', - '../third_party/externals/libwebp/enc/syntax.c', - '../third_party/externals/libwebp/enc/tree.c', - '../third_party/externals/libwebp/enc/vp8l.c', - '../third_party/externals/libwebp/enc/webpenc.c', + '../third_party/externals/libwebp/src/enc/alpha.c', + '../third_party/externals/libwebp/src/enc/analysis.c', + '../third_party/externals/libwebp/src/enc/backward_references.c', + '../third_party/externals/libwebp/src/enc/config.c', + '../third_party/externals/libwebp/src/enc/cost.c', + '../third_party/externals/libwebp/src/enc/filter.c', + '../third_party/externals/libwebp/src/enc/frame.c', + '../third_party/externals/libwebp/src/enc/histogram.c', + '../third_party/externals/libwebp/src/enc/iterator.c', + '../third_party/externals/libwebp/src/enc/layer.c', + '../third_party/externals/libwebp/src/enc/picture.c', + '../third_party/externals/libwebp/src/enc/quant.c', + '../third_party/externals/libwebp/src/enc/syntax.c', + '../third_party/externals/libwebp/src/enc/token.c', + '../third_party/externals/libwebp/src/enc/tree.c', + '../third_party/externals/libwebp/src/enc/vp8l.c', + '../third_party/externals/libwebp/src/enc/webpenc.c', ], }, { @@ -107,16 +118,17 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/utils/bit_reader.c', - '../third_party/externals/libwebp/utils/bit_writer.c', - '../third_party/externals/libwebp/utils/color_cache.c', - '../third_party/externals/libwebp/utils/filters.c', - '../third_party/externals/libwebp/utils/huffman.c', - '../third_party/externals/libwebp/utils/huffman_encode.c', - '../third_party/externals/libwebp/utils/quant_levels.c', - '../third_party/externals/libwebp/utils/rescaler.c', - '../third_party/externals/libwebp/utils/thread.c', - '../third_party/externals/libwebp/utils/utils.c', + '../third_party/externals/libwebp/src/utils/bit_reader.c', + '../third_party/externals/libwebp/src/utils/bit_writer.c', + '../third_party/externals/libwebp/src/utils/color_cache.c', + '../third_party/externals/libwebp/src/utils/filters.c', + '../third_party/externals/libwebp/src/utils/huffman.c', + '../third_party/externals/libwebp/src/utils/huffman_encode.c', + '../third_party/externals/libwebp/src/utils/quant_levels.c', + '../third_party/externals/libwebp/src/utils/quant_levels_dec.c', + '../third_party/externals/libwebp/src/utils/rescaler.c', + '../third_party/externals/libwebp/src/utils/thread.c', + '../third_party/externals/libwebp/src/utils/utils.c', ], }, { @@ -124,6 +136,7 @@ 'type': 'none', 'dependencies' : [ 'libwebp_dec', + 'libwebp_demux', 'libwebp_dsp', 'libwebp_dsp_neon', 'libwebp_enc', @@ -131,7 +144,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/libwebp', + '../third_party/externals/libwebp/src', ], }, 'conditions': [ |