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: 182386024
Test: atest CtsMediaTestCases:android.media.cts.DecoderTest#testFlacIdentity
Test: atest CtsMediaTestCases:android.media.cts.DecoderTest#testDecodeFlac
Change-Id: I0e583100236bf3d68f46dbde275cf57b4d97c31d
diff --git a/media/codec2/components/flac/Android.bp b/media/codec2/components/flac/Android.bp
index 1143bed..38dfce4 100644
--- a/media/codec2/components/flac/Android.bp
+++ b/media/codec2/components/flac/Android.bp
@@ -42,11 +42,8 @@
srcs: ["C2SoftFlacEnc.cpp"],
- shared_libs: [
- "libaudioutils",
- ],
-
static_libs: [
"libFLAC",
+ "libaudioutils",
],
}
diff --git a/media/libstagefright/flac/dec/Android.bp b/media/libstagefright/flac/dec/Android.bp
index 225c930..665aae1 100644
--- a/media/libstagefright/flac/dec/Android.bp
+++ b/media/libstagefright/flac/dec/Android.bp
@@ -40,12 +40,12 @@
},
shared_libs: [
- "libaudioutils",
"liblog",
],
static_libs: [
"libFLAC",
+ "libaudioutils", // needed for 'float_from_i32'
],
export_static_lib_headers: [