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

Commit 0636fa9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" am: 85906d7c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1560548

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8818db1ca1075415517a9f8ecb7dbc6df744d07
parents 7e4f4b48 85906d7c

cmds/idlcli/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
cc_defaults {

    name: "idlcli-defaults",

    shared_libs: [

        "android.hardware.vibrator-ndk_platform",

        "android.hardware.vibrator-V1-ndk_platform",

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",

        "android.hardware.vibrator@1.2",

libs/gralloc/types/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -43,14 +43,14 @@ cc_library { 
    ],



    shared_libs: [

        "android.hardware.graphics.common-unstable-ndk_platform",

        "android.hardware.graphics.common-V2-ndk_platform",

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

        "liblog",

    ],



    export_shared_lib_headers: [

        "android.hardware.graphics.common-unstable-ndk_platform",

        "android.hardware.graphics.common-V2-ndk_platform",

        "android.hardware.graphics.mapper@4.0",

        "libhidlbase",

    ],

libs/ui/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ cc_library_shared { 
        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.allocator@4.0",

        "android.hardware.graphics.common-unstable-ndk_platform",

        "android.hardware.graphics.common-V2-ndk_platform",

        "android.hardware.graphics.common@1.2",

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

        "android.hardware.graphics.mapper@2.1",
@@ -89,7 +89,7 @@ cc_library_shared { 


    export_shared_lib_headers: [

        "android.hardware.graphics.common@1.2",

        "android.hardware.graphics.common-unstable-ndk_platform",

        "android.hardware.graphics.common-V2-ndk_platform",

        "android.hardware.graphics.mapper@4.0",

        "libgralloctypes",

    ],

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "android.hardware.power-cpp",

        "android.hardware.power-V1-cpp",

        "libbase",

        "libbinder",

        "libbufferhubqueue",

services/surfaceflinger/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ cc_test { 
        "libtrace_proto",

    ],

    shared_libs: [

        "android.hardware.graphics.common-unstable-ndk_platform",

        "android.hardware.graphics.common-V2-ndk_platform",

        "android.hardware.graphics.common@1.2",

        "android.hardware.graphics.composer@2.1",

        "libandroid",