| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-06-27 02:25:35 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-06-27 02:25:35 (GMT) |
| commit | a8621b138dfd0496dbe521d394bf94676d7d01b0 (patch) | |
| tree | ebf96db73ed6278bada465b767f93b0264331814 | |
| parent | 24e1dbe5fd833dd75f850ab41feb5bd7fcee5af1 (diff) | |
| parent | 66ca413e4c33201a31939239bb6495c06f1b163e (diff) | |
| download | darwin-a8621b138dfd0496dbe521d394bf94676d7d01b0.zip darwin-a8621b138dfd0496dbe521d394bf94676d7d01b0.tar.gz darwin-a8621b138dfd0496dbe521d394bf94676d7d01b0.tar.bz2 | |
Merge "darwin:update from 1.0 to 2.0[1/1]" into p-amlogic
| -rw-r--r-- | device.mk | 8 | ||||
| -rw-r--r-- | manifest.xml | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -89,3 +89,11 @@ $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-he # set default USB configuration PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ persist.sys.usb.config=mtp + +#To remove healthd from the build +PRODUCT_PACKAGES += android.hardware.health@2.0-service.override +DEVICE_FRAMEWORK_MANIFEST_FILE += \ + system/libhidl/vintfdata/manifest_healthd_exclude.xml + +#To keep healthd in the build +PRODUCT_PACKAGES += android.hardware.health@2.0-service diff --git a/manifest.xml b/manifest.xml index 9526021..85e3946 100644 --- a/manifest.xml +++ b/manifest.xml @@ -246,7 +246,7 @@ <hal format="hidl"> <name>android.hardware.health</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>2.0</version> <interface> <name>IHealth</name> <instance>default</instance> |