Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99c2b704 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

[ExtractorUnitTest] Fix linker failures with upstream lld

Bug: http://b/197965342

This change is needed to build this test with upstream lld.

Avoid linking static libraries that are already needed by shared_lib
dependencies of ExtractorUnitTest (e.g. libmedia.so).
- Use shared libstagefright and libstagefright_foundation instead.
- libstagefright_mpeg2extractor does not have a shared variant but it
seems unnecessary to link this test.

Test: build with aosp/1809741 which has lld with the above behavior.
Change-Id: Id83e6446a3bf903c891367de8ea2b23bc57efa34
Merged-In: Id83e6446a3bf903c891367de8ea2b23bc57efa34
(cherry picked from commit d0b96157)
parent 09120f44
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -45,14 +45,11 @@ cc_test {
        "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 @@ cc_test {
        "libcutils",
        "libmediandk",
        "libmedia",
        "libstagefright",
        "libstagefright_foundation",
        "libcrypto",
        "libhidlmemory",
        "libhidlbase",