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

Commit ed57f16c authored Jan 24, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jan 24, 2023

Merge "Update health AIDL HAL to V2" am: e3ebedd2 am: df7a9196 am: ed5fc4f4

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2317272

Change-Id: I98397bd8805648dce5c03e558ac5d484de78868e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents dc02500b ed5fc4f4

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ cc_binary {
		],

		shared_libs: [
		"android.hardware.health-V1-ndk", // from librecovery_utils
		"android.hardware.health-V2-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-V1-ndk", // from librecovery_utils
		"android.hardware.health-V2-ndk", // from librecovery_utils
		"libbase",
		"libcrypto",
		],
		@@ -129,7 +129,7 @@ cc_test {
		],

		static_libs: [
		"android.hardware.health-V1-ndk", // from librecovery_utils
		"android.hardware.health-V2-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-V1-ndk.so
		// because at the time of writing, android.hardware.health-V2-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-V1-ndk",
		"android.hardware.health-V2-ndk",
		],

		export_include_dirs: [

tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ cc_test {

		static_libs: libapplypatch_static_libs + librecovery_static_libs + [
		"android.hardware.health-translate-ndk",
		"android.hardware.health-V1-ndk",
		"android.hardware.health-V2-ndk",
		"libhealthshim",
		"librecovery_ui",
		"libfusesideload",