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

Commit 7747aa9e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modules: Update dependencies on graphics.common HAL to use defaults"... 

Merge "Modules: Update dependencies on graphics.common HAL to use defaults" into main am: 658915ce

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



Change-Id: I8f27011291ccbc8e3a85000f064486b6b5a4363b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cda3c7bc 658915ce

media/module/aidlpersistentsurface/Android.bp

+6 −4
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ aidl_interface { 
    unstable: true,

    local_include_dir: "aidl",

    min_sdk_version: "29",

    defaults: [

        "android.hardware.graphics.common-latest"

    ],

    srcs: [

        "aidl/android/media/AidlColorAspects.aidl",

        "aidl/android/media/IAidlGraphicBufferSource.aidl",
@@ -12,9 +15,6 @@ aidl_interface { 
    headers: [

        "HardwareBuffer_aidl",

    ],

    imports: [

        "android.hardware.graphics.common-V5",

    ],

    include_dirs: [

        "frameworks/native/aidl/gui",

    ],
@@ -41,6 +41,9 @@ aidl_interface { 
cc_library_shared {

    name: "libstagefright_graphicbuffersource_aidl",

    min_sdk_version: "29",

    defaults: [

        "android.hardware.graphics.common-ndk_shared",

    ],

    srcs: [

        "AidlGraphicBufferSource.cpp",

        "wrapper/WAidlGraphicBufferSource.cpp",
@@ -56,7 +59,6 @@ cc_library_shared { 
        "media_plugin_headers",

    ],

    shared_libs: [

        "android.hardware.graphics.common-V5-ndk",

        "graphicbuffersource-aidl-ndk",

        "libbinder_ndk",

        "libcutils",