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

Commit 27571311 authored by Jeongik Cha's avatar Jeongik Cha Committed by Automerger Merge Worker
Browse files

Merge "Specify version for aidl_interface explicitly" into sc-dev am: 09dfe2a6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1e949dd830a567c8fe67d0335b788a24bed2f30
parents 783969e1 09dfe2a6

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-unstable-ndk_platform",

        "android.hardware.vibrator-V2-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
@@ -140,7 +140,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",
@@ -157,7 +157,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/powermanager/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ cc_library_shared { 
        "libutils",

        "android.hardware.power@1.0",

        "android.hardware.power@1.1",

        "android.hardware.power-cpp",

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

    ],



    cflags: [

services/powermanager/benchmarks/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ cc_benchmark { 
        "libutils",

        "android.hardware.power@1.0",

        "android.hardware.power@1.1",

        "android.hardware.power-cpp",

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

    ],

    static_libs: [

        "libtestUtil",