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

Commit 0edf57e0 authored by Jack Wu's avatar Jack Wu
Browse files

health: fix depending on multiple versions of the same aidl_interface 



When health aidl_interface version updraged, some libraries are
depending on V1 and android.hardware.health-translate-ndk at the
same time. It will cause multiple versions depending if
android.hardware.health-translate-ndk is depending on new version.
version.

Fork android.hardware.health-translate-ndk generate two versions,
so that other libraries can depend on the same aidl_interface,
to avoid multiple versions depending.

Bug: 251425963
Test: m
Change-Id: I0641e9f6c1445ee2549b956012ebb35eb1f8ac97
Signed-off-by: default avatarJack Wu <wjack@google.com>
parent b490783a

health/aidl/Android.bp

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




}

}





cc_library {

cc_defaults {

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

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

    vendor_available: true,

    vendor_available: true,

    recovery_available: true,

    recovery_available: true,

    host_supported: true,

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

    shared_libs: [

        "libbinder_ndk",

        "libbinder_ndk",

        "libhidlbase",

        "libhidlbase",

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

        "android.hardware.health@2.0",

        "android.hardware.health@2.0",

        "android.hardware.health@2.1",

        "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 {

java_library {

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

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

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

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