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

Commit 809d430f authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge changes I6991827a,I85299a83 am: e87ca157 am: 6406b938 am: cac3ba5c... 

Merge changes I6991827a,I85299a83 am: e87ca157 am: 6406b938 am: cac3ba5c am: f3a87180 am: 92c96390

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

Change-Id: I30afaca3e4a897f75f07b3546e3e5bb931d69376
parents dd2d71dc 92c96390

media/extractors/aac/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ cc_library { 
        "libutils",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },

}

media/extractors/flac/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -21,4 +21,12 @@ cc_library { 
        "libutils",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },



}

media/extractors/mkv/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -21,4 +21,12 @@ cc_library { 
        "libutils",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },



}

media/extractors/mp3/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -13,4 +13,11 @@ cc_library { 
        "libstagefright_foundation",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },

}

media/extractors/ogg/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -20,4 +20,11 @@ cc_library { 
        "libvorbisidec",

    ],



    host_supported: true,



    target: {

        darwin: {

            enabled: false,

        },

    },

}