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

Commit 74c6581a authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge "Update recovery to use Health AIDL HAL V3." into main

parents 38ed74d1 8ee048d7

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

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

        "librecovery_ui",

    ],

minadbd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "libbase",

        "libcrypto",

    ],
@@ -129,7 +129,7 @@ cc_test { 
    ],



    static_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "libminadbd_services",

        "libfusesideload",

        "librecovery_utils",

recovery_utils/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ cc_library_static { 


    shared_libs: [

        // The following cannot be placed in librecovery_utils_defaults,

        // because at the time of writing, android.hardware.health-V2-ndk.so

        // because at the time of writing, android.hardware.health-V3-ndk.so

        // is not installed to the system image yet. (It is installed

        // to the recovery ramdisk.) Hence, minadbd_test must link to it

        // statically.

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

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

    ],



    export_include_dirs: [

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ cc_test { 


    static_libs: libapplypatch_static_libs + librecovery_static_libs + [

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

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

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

        "libhealthshim",

        "librecovery_ui",

        "libfusesideload",