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

Commit 6406b938 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge changes I6991827a,I85299a83 am: e87ca157

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

Change-Id: Ia6606d70e034310aa57474f8ad6eb5437522cb51
parents 26bdf777 e87ca157
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ cc_library {
        "libutils",
    ],

    host_supported: true,

    target: {
        darwin: {
            enabled: false,
        },
    },
}
+8 −0
Original line number Diff line number Diff line
@@ -20,4 +20,12 @@ cc_library {
        "libutils",
    ],

    host_supported: true,

    target: {
        darwin: {
            enabled: false,
        },
    },

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

    host_supported: true,

    target: {
        darwin: {
            enabled: false,
        },
    },

}
+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,
        },
    },
}
+7 −0
Original line number Diff line number Diff line
@@ -20,4 +20,11 @@ cc_library {
        "libvorbisidec",
    ],

    host_supported: true,

    target: {
        darwin: {
            enabled: false,
        },
    },
}
Loading