Merge "Reserve space in super for dynamic partition metadata"
diff --git a/device-common.mk b/device-common.mk
index 918bed0..58353b8 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -163,8 +163,8 @@
# Health
PRODUCT_PACKAGES += \
- android.hardware.health@2.0-service \
- android.hardware.health@2.0-impl
+ android.hardware.health@2.1-impl-cuttlefish \
+ android.hardware.health@2.1-service
# mkbootimg host tool to build boot.img separately
PRODUCT_HOST_PACKAGES := \
diff --git a/manifest.xml b/manifest.xml
index 0c7ae03..2034741 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -94,15 +94,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.health</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>IHealth</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.keymaster</name>
<transport>hwbinder</transport>
<version>3.0</version>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 70ab83c..e36d1b2 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -39,6 +39,7 @@
/vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc\.gbm\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/android\.hardware\.health@2\.0-impl-2\.1-cuttlefish\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libdrm_freedreno\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libgbm_mesa\.so u:object_r:same_process_hal_file:s0