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

Commit 2519af66 authored Nov 25, 2024 by Daniel Zheng Committed by Android (Google) Code Review Nov 25, 2024

Merge "recovery: use v4 Health HAL" into main

parents 18e21f42 b6a21705

Android.bp

+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",
		],

minadbd/Android.bp

+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",

recovery_utils/Android.bp

+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: [

tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,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",