commit 2b3da16a37b3f8338c1554efd727100c7d76482c
author Pirama Arumuga Nainar <pirama@google.com> Mon Aug 30 19:07:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 30 19:07:27 2021 +0000
tree 73a4671efbc543dc4bd426c62963d74fdc09ee70
parent b04f4facb7403af8272c81fb8c8e18d4b63d2578
parent af6cea1a241ca5701db931ab96faec26f4a9224f

Merge "[ExtractorUnitTest] Fix linker failures with upstream lld" into sc-mainline-prod am: af6cea1a24

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15694767

Change-Id: I9fb6872688839b1b7b5cd297d00542e3a419c35b

media/extractors/tests/Android.bp

diff --git a/media/extractors/tests/Android.bp b/media/extractors/tests/Android.bp
index 5d97d9a..23c74f7 100644
--- a/media/extractors/tests/Android.bp
+++ b/media/extractors/tests/Android.bp
@@ -45,14 +45,11 @@
         "libdatasource",
         "libwatchdog",
 
-        "libstagefright",
         "libstagefright_id3",
         "libstagefright_flacdec",
         "libstagefright_esds",
         "libstagefright_mpeg2support",
-        "libstagefright_mpeg2extractor",
         "libstagefright_foundation_colorutils_ndk",
-        "libstagefright_foundation",
         "libstagefright_metadatautils",
 
         "libmedia_midiiowrapper",
@@ -74,6 +71,8 @@
         "libcutils",
         "libmediandk",
         "libmedia",
+        "libstagefright",
+        "libstagefright_foundation",
         "libcrypto",
         "libhidlmemory",
         "libhidlbase",