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

Commit b097ba5a authored by Ray Essick's avatar Ray Essick
Browse files

Better partitioning module/non-module libraries 

Instead of including source files in both libstagefright
and libstagefrightt_mpeg2extractor, have libstagefright include
the libstagefright_mpeg2extractor library. This preps us for
dis-entangling the source trees for those two.

Bug: 245354160
Test: build, boot
Test: CtsMediaExtractorTestCases
Change-Id: Iba0330c9ee257ddb8a5d41963ff0cc9dd8ecb64a
parent df94c73b

media/libstagefright/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ cc_library_shared { 
    },

}



// this library gets wrapped into libstagefright as well as modules

cc_library_static {

    name: "libstagefright_mpeg2extractor",

    apex_available: [
@@ -241,7 +242,6 @@ cc_library { 
        "CodecErrorLog.cpp",

        "CryptoAsync.cpp",

        "FrameDecoder.cpp",

        "HevcUtils.cpp",

        "InterfaceUtils.cpp",

        "JPEGSource.cpp",

        "MPEG2TSWriter.cpp",
@@ -255,7 +255,6 @@ cc_library { 
        "MediaCodecSource.cpp",

        "MediaExtractor.cpp",

        "MediaExtractorFactory.cpp",

        "MediaSource.cpp",

        "MediaSync.cpp",

        "MediaTrack.cpp",

        "MediaMuxer.cpp",
@@ -269,7 +268,6 @@ cc_library { 
        "StagefrightMediaScanner.cpp",

        "SurfaceUtils.cpp",

        "ThrottledSource.cpp",

        "Utils.cpp",

        "VideoFrameSchedulerBase.cpp",

        "VideoFrameScheduler.cpp",

    ],
@@ -328,6 +326,11 @@ cc_library { 
        "libmedia_ndkformatpriv",

    ],



    // to get Utils, MediaSource, HevcUtils

    whole_static_libs: [

        "libstagefright_mpeg2extractor",

    ],



    header_libs:[

        "libmediadrm_headers",

        "libnativeloader-headers",