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

Commit 73a56915 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Revert "Better partitioning module/non-module libraries" 

This reverts commit b097ba5a.

Reason for revert: original CL disabled audio offloading

Bug: 279000941
Bug: 245354160
Change-Id: Ia3cdcfd671ce4726ce474bfe71e6e01708739091
parent b097ba5a

media/libstagefright/Android.bp

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

}



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

cc_library_static {

    name: "libstagefright_mpeg2extractor",

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

        "CryptoAsync.cpp",

        "FrameDecoder.cpp",

        "HevcUtils.cpp",

        "InterfaceUtils.cpp",

        "JPEGSource.cpp",

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

        "MediaExtractor.cpp",

        "MediaExtractorFactory.cpp",

        "MediaSource.cpp",

        "MediaSync.cpp",

        "MediaTrack.cpp",

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

        "SurfaceUtils.cpp",

        "ThrottledSource.cpp",

        "Utils.cpp",

        "VideoFrameSchedulerBase.cpp",

        "VideoFrameScheduler.cpp",

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

    ],



    // to get Utils, MediaSource, HevcUtils

    whole_static_libs: [

        "libstagefright_mpeg2extractor",

    ],



    header_libs:[

        "libmediadrm_headers",

        "libnativeloader-headers",