Merge "Fix webp build to avoid linking errors when building on mac" am: 274be04ff7 am: c15a3524ca am: 65a144b939r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-release

Change-Id: Ib72e3aa9b93fbe0e155ad16479214deeed47da73

1 files changed, 2 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index d7e0eb04..22219506 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",