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

Commit c33deac9 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Set min_sdk_version (for non-mainline files)" am: 990e294f 

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

Change-Id: I4eeb1aae95547605198dd1a490b19e8c8e1f81bc
parents 40d4e2df 990e294f

media/bufferpool/2.0/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ cc_library { 
    name: "libstagefright_bufferpool@2.0.1",

    defaults: ["libstagefright_bufferpool@2.0-default"],

    vendor_available: true,

    min_sdk_version: "29",

    cflags: [

        "-DBUFFERPOOL_CLONE_HANDLES",

    ],

media/codec2/core/Android.bp

+2 −0
Original line number Diff line number Diff line 
cc_library_headers {

    name: "libcodec2_headers",

    vendor_available: true,

    min_sdk_version: "29",

    export_include_dirs: ["include"],

}



cc_library_shared {

    name: "libcodec2",

    vendor_available: true,

    min_sdk_version: "29",

    vndk: {

        enabled: true,

    },

media/codec2/hidl/1.0/utils/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ cc_library { 
cc_library {

    name: "libcodec2_hidl@1.0",

    vendor_available: true,

    min_sdk_version: "29",



    defaults: ["hidl_defaults"],

media/codec2/sfplugin/utils/Android.bp

+1 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libsfplugin_ccodec_utils",

    vendor_available: true,

    min_sdk_version: "29",



    srcs: [

        "Codec2BufferUtils.cpp",

media/codec2/vndk/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ cc_library_headers { 


    // TODO: Remove this when this module is moved back to frameworks/av.

    vendor_available: true,



    min_sdk_version: "29",

}



// !!!DO NOT DEPEND ON THIS SHARED LIBRARY DIRECTLY!!!
@@ -14,6 +16,7 @@ cc_library_headers { 
cc_library_shared {

    name: "libcodec2_vndk",

    vendor_available: true,

    min_sdk_version: "29",



    srcs: [

        "C2AllocatorIon.cpp",
@@ -87,6 +90,8 @@ cc_defaults { 
        "libcodec2_vndk",

        "libutils",

    ],



    min_sdk_version: "29",

}



// public dependency for implementing Codec 2 framework utilities