diff options
| author | Jerome Gaillard <jgaillard@google.com> | 2020-02-04 11:29:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-04 11:29:59 +0000 |
| commit | 274be04ff7e90c3118fda0cc0774663ac2ffa660 (patch) | |
| tree | 92833d215f8feaef56ae9a12245b43f82ee0c7ae | |
| parent | f6623f00a5dae9ec51cccb19570c43e742de7647 (diff) | |
| parent | 47c6dd4d7f3100583d0ac025cddb170890491c9d (diff) | |
| download | webp-274be04ff7e90c3118fda0cc0774663ac2ffa660.tar.gz | |
Merge "Fix webp build to avoid linking errors when building on mac"android-r-preview-1
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 2 insertions, 13 deletions
@@ -32,11 +32,6 @@ cc_library_static { name: "libwebp-encode", host_supported: true, srcs: [ - "src/dsp/alpha_processing.c", - "src/dsp/alpha_processing_mips_dsp_r2.c", - "src/dsp/alpha_processing_neon.c", - "src/dsp/alpha_processing_sse2.c", - "src/dsp/alpha_processing_sse41.c", "src/dsp/cost.c", "src/dsp/cost_mips32.c", "src/dsp/cost_mips_dsp_r2.c", @@ -86,17 +81,9 @@ cc_library_static { "src/mux/muxedit.c", "src/mux/muxinternal.c", "src/mux/muxread.c", - "src/utils/bit_reader_utils.c", "src/utils/bit_writer_utils.c", - "src/utils/color_cache_utils.c", - "src/utils/filters_utils.c", "src/utils/huffman_encode_utils.c", - "src/utils/huffman_utils.c", "src/utils/quant_levels_utils.c", - "src/utils/random_utils.c", - "src/utils/rescaler_utils.c", - "src/utils/thread_utils.c", - "src/utils/utils.c", ], arch: { @@ -143,9 +130,11 @@ cc_library_static { "src/dec/vp8_dec.c", "src/dec/vp8l_dec.c", "src/dec/webp_dec.c", + "src/demux/anim_decode.c", "src/demux/demux.c", "src/dsp/alpha_processing.c", "src/dsp/alpha_processing_mips_dsp_r2.c", + "src/dsp/alpha_processing_neon.c", "src/dsp/alpha_processing_sse2.c", "src/dsp/alpha_processing_sse41.c", "src/dsp/cpu.c", |