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

Commit b6d9b68e authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: I85787a9ebe95a709c7ac6977218511c113263294
Change-Id: I4601b409db3e53dc2e2ed685f1e69b1792154f71
parents 24d22bec 5c4f768f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ cc_binary {
    ],

    shared_libs: [
        "android.hardware.health-V3-ndk", // from librecovery_utils
        "android.hardware.health-V4-ndk", // from librecovery_utils
        "android.hardware.boot-V1-ndk",
        "librecovery_ui",
    ],
+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ cc_binary {
    ],

    shared_libs: [
        "android.hardware.health-V3-ndk", // from librecovery_utils
        "android.hardware.health-V4-ndk", // from librecovery_utils
        "libbase",
        "libcrypto",
    ],
@@ -130,7 +130,7 @@ cc_test {
    ],

    static_libs: [
        "android.hardware.health-V3-ndk", // from librecovery_utils
        "android.hardware.health-V4-ndk", // from librecovery_utils
        "libminadbd_services",
        "libfusesideload",
        "librecovery_utils",
+3 −3
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-V3-ndk.so
        // because at the time of writing, android.hardware.health-V4-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-V3-ndk",
        "android.hardware.health-V4-ndk",
    ],

    export_include_dirs: [
+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ cc_test {

    static_libs: librecovery_static_libs + [
        "android.hardware.health-translate-ndk",
        "android.hardware.health-V3-ndk",
        "android.hardware.health-V4-ndk",
        "libhealthshim",
        "librecovery_ui",
        "libfusesideload",