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

Commit 46353e1e authored by Jack Wu's avatar Jack Wu Committed by Automerger Merge Worker
Browse files

health: fix depending on multiple versions of the same aidl_interface am: 0edf57e0 am: 329cfa1b 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2380669



Change-Id: I407178968f7e664fe9b1c276f76df8708b114e95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b6adf73 329cfa1b

health/aidl/Android.bp

+19 −3
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ aidl_interface { 


}



cc_library {

    name: "android.hardware.health-translate-ndk",

cc_defaults {

    name: "android.hardware.health-translate-ndk_defaults",

    vendor_available: true,

    recovery_available: true,

    host_supported: true,
@@ -55,7 +55,6 @@ cc_library { 
    shared_libs: [

        "libbinder_ndk",

        "libhidlbase",

        "android.hardware.health-V1-ndk",

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

    ],
@@ -71,6 +70,23 @@ cc_library { 
    },

}



cc_library {

    name: "android.hardware.health-translate-ndk",

    defaults: ["android.hardware.health-translate-ndk_defaults"],

    shared_libs: [

        "android.hardware.health-V1-ndk",

    ],

}



// TODO(b/251425963): remove when android.hardware.health is upgraded to V2.

cc_library {

    name: "android.hardware.health-translate-V1-ndk",

    defaults: ["android.hardware.health-translate-ndk_defaults"],

    shared_libs: [

        "android.hardware.health-V1-ndk",

    ],

}



java_library {

    name: "android.hardware.health-translate-java",

    srcs: ["android/hardware/health/Translate.java"],