diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-04 11:48:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-04 11:48:17 +0000 |
| commit | 65a144b93908f01c0261295d8d611fc2e146d1ba (patch) | |
| tree | 92833d215f8feaef56ae9a12245b43f82ee0c7ae | |
| parent | 0580efe90f4dbe19b093a56be2a259648e31c77d (diff) | |
| parent | c15a3524ca533d266acaac6aa38e14ac9b3fd30a (diff) | |
| download | webp-65a144b93908f01c0261295d8d611fc2e146d1ba.tar.gz | |
Merge "Fix webp build to avoid linking errors when building on mac" am: 274be04ff7 am: c15a3524ca
Change-Id: Ie02754bb61ea1a1985e529a28d6f0e22c62f3d5c
| -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", |