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

Commit b160523a authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

Merge "media.c2 aidl: Use bufferpool2 V2" into main am: 423dc1a0 

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



Change-Id: I707cb0f9e073e68d2eb976fcab16dbb5adc3b694
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b3d305e 423dc1a0

media/codec2/hal/aidl/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ cc_library { 
    shared_libs: [

    shared_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

        "android.hardware.media.c2-V1-ndk",

        "android.hardware.media.c2-V1-ndk",

        "libbinder_ndk",

        "libbinder_ndk",

        "libbase",

        "libbase",
@@ -84,7 +84,7 @@ cc_library { 




    shared_libs: [

    shared_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

        "android.hardware.media.c2-V1-ndk",

        "android.hardware.media.c2-V1-ndk",

        "libbase",

        "libbase",

        "libbinder_ndk",

        "libbinder_ndk",

media/codec2/hal/client/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ cc_library { 
        "android.hardware.media.c2@1.0",

        "android.hardware.media.c2@1.0",

        "android.hardware.media.c2@1.1",

        "android.hardware.media.c2@1.1",

        "android.hardware.media.c2@1.2",

        "android.hardware.media.c2@1.2",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

        "android.hardware.media.c2-V1-ndk",

        "android.hardware.media.c2-V1-ndk",

        "libbase",

        "libbase",

        "libbinder",

        "libbinder",

media/codec2/vndk/Android.bp

+4 −3
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ cc_library { 
        "libbase",

        "libbase",

        "libdmabufheap",

        "libdmabufheap",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

    ],

    ],





    local_include_dirs: [

    local_include_dirs: [
@@ -102,7 +102,7 @@ cc_library { 
        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

        "android.hardware.media.c2-V1-ndk",

        "android.hardware.media.c2-V1-ndk",

        "libbase",

        "libbase",

        "libbinder_ndk",

        "libbinder_ndk",
@@ -162,11 +162,12 @@ cc_defaults { 
        "android.hardware.graphics.bufferqueue@2.0",

        "android.hardware.graphics.bufferqueue@2.0",

        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.media.bufferpool2-V1-ndk",

        "android.hardware.media.bufferpool2-V2-ndk",

        "android.hardware.media.c2-V1-ndk",

        "android.hardware.media.c2-V1-ndk",

    ],

    ],





    shared_libs: [

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "libbinder_ndk",

        "libui",

        "libui",

        "libdl",

        "libdl",