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

Commit 89715382 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Create libstagefright_mp3dec_headers" am: e9ebb9ef am: e54bbcdf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35ca6267d2f70e4d88175b846c55c252b07cc1a9
parents 83d4e6eb e54bbcdf
Loading
Loading
Loading
Loading
+17 −4
Original line number Original line Diff line number Diff line
cc_library_headers {
    name: "libstagefright_mp3dec_headers",
    vendor_available: true,
    min_sdk_version: "29",
    host_supported:true,
    export_include_dirs: [
        "include",
        "src",
    ],
    apex_available: [
        "//apex_available:platform",
        "com.android.media.swcodec",
    ],
}

cc_library_static {
cc_library_static {
    name: "libstagefright_mp3dec",
    name: "libstagefright_mp3dec",
    vendor_available: true,
    vendor_available: true,
@@ -65,10 +80,8 @@ cc_library_static {


    include_dirs: ["frameworks/av/media/libstagefright/include"],
    include_dirs: ["frameworks/av/media/libstagefright/include"],


    export_include_dirs: [
    header_libs: ["libstagefright_mp3dec_headers"],
        "include",
    export_header_lib_headers: ["libstagefright_mp3dec_headers"],
        "src",
    ],


    cflags: [
    cflags: [
        "-DOSCL_UNUSED_ARG(x)=(void)(x)",
        "-DOSCL_UNUSED_ARG(x)=(void)(x)",