commit 6496137f7bdf2bb7bcc62feeffb682c5fbc5d451
author Ray Essick <essick@google.com> Wed Mar 10 13:02:09 2021 -0800
committer Ray Essick <essick@google.com> Thu Mar 11 01:27:41 2021 +0000
tree 39138dd08797d71e17a870a47f5f6cca90ba8440
parent 78a051bd359058d83fbe051b5b7212c67442d000

Flac codec link statically against libaudio_utils

Static linking avoids pulling in most of the library, along with the related
downstream dependencies that come with rest of the library.

Bug: 175515423
Test: atest CtsMediaTestCases:android.media.cts.DecoderTest#testFlacIdentity
Test: atest CtsMediaTestCases:android.media.cts.DecoderTest#testDecodeFlac
Change-Id: I0e583100236bf3d68f46dbde275cf57b4d97c31d
(cherry picked from commit 2e6a54ef411b62a23ba08cf7d83d94b429a7ad24)

media/codec2/components/flac/Android.bp

diff --git a/media/codec2/components/flac/Android.bp b/media/codec2/components/flac/Android.bp
index 603c412..3529fec 100644
--- a/media/codec2/components/flac/Android.bp
+++ b/media/codec2/components/flac/Android.bp
@@ -23,11 +23,8 @@
 
     srcs: ["C2SoftFlacEnc.cpp"],
 
-    shared_libs: [
-        "libaudioutils",
-    ],
-
     static_libs: [
         "libFLAC",
+        "libaudioutils",
     ],
 }

media/libstagefright/flac/dec/Android.bp

diff --git a/media/libstagefright/flac/dec/Android.bp b/media/libstagefright/flac/dec/Android.bp
index 32b2075..55807d7 100644
--- a/media/libstagefright/flac/dec/Android.bp
+++ b/media/libstagefright/flac/dec/Android.bp
@@ -20,12 +20,12 @@
     },
 
     shared_libs: [
-        "libaudioutils",
         "liblog",
     ],
 
     static_libs: [
         "libFLAC",
+        "libaudioutils", // needed for 'float_from_i32'
     ],
 
     export_static_lib_headers: [