commit c19f090011a63dfd561062a101b1f60b1f420a5b
author Yifan Hong <elsk@google.com> Thu Oct 31 21:26:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 31 21:26:38 2019 +0000
tree 86647ce7c0295704d85fd0b268d14759800585aa
parent 7562e00263500e3557b778e5ef848b49c8516058
parent a916b2e5c2b2d638ab747aa2e1885eb380af9c7e

Merge "CF health 2.1"

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 2899871..a3eb81c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -51,3 +51,6 @@
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service.cuttlefish)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.cuttlefish.rc)

shared/config/manifest.xml

diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 9a66e49..a9eb8fc 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -172,15 +172,6 @@
             <instance>default</instance>
         </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>
     <!-- TODO (b/130075874):
     <hal format="hidl">
         <name>android.hardware.ir</name>

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index dfb0a93..433c96b 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -267,7 +267,8 @@
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service.cuttlefish
+    android.hardware.health@2.1-impl-cuttlefish \
+    android.hardware.health@2.1-service
 
 # Health Storage
 PRODUCT_PACKAGES += \

shared/sepolicy/vendor/file_contexts

diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 77c39cb..70b47ad 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -64,7 +64,6 @@
 /vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.widevine  u:object_r:hal_drm_widevine_exec:s0
 /vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish  u:object_r:hal_dumpstate_impl_exec:s0
 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software  u:object_r:hal_gatekeeper_default_exec:s0
-/vendor/bin/hw/android\.hardware\.health@2\.0-service\.cuttlefish  u:object_r:hal_health_default_exec:s0
 /vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-sample-.*   u:object_r:hal_neuralnetworks_sample_exec:s0
 /vendor/bin/hw/android\.hardware\.vibrator@1\.x-service\.example u:object_r:hal_vibrator_default_exec:s0
@@ -82,6 +81,7 @@
 /vendor/lib(64)?/libglapi.so  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@2\.0-impl-2\.1\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/android\.hardware\.health@2\.1-impl-cuttlefish  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/gralloc.cutf_ashmem.so  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/gralloc.minigbm.so  u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libcuttlefish_fs.so  u:object_r:same_process_hal_file:s0