diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-07-28 00:50:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-28 00:50:26 +0000 |
| commit | 6b39973bcea86de295087ab890beae3970318e7e (patch) | |
| tree | 249a2651f6d06a43c90b6e73265848fb74927c7d | |
| parent | 537ff2d15e3fc63f6d8ade0a0294e3e326806c7f (diff) | |
| parent | df08007b241b6cde239857577f9fa6fe92177c48 (diff) | |
| download | hikey-6b39973bcea86de295087ab890beae3970318e7e.tar.gz | |
hikey960: Update PRODUCT_SHIPPING_API_LEVEL to 30 and FCM to 5 am: f81198849b am: b637a65c16 am: 7b0621bd07 am: df08007b24
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1759049
Change-Id: I384d1915f2aafc927bcdf72558b13d5cf6ad555f
| -rw-r--r-- | device-common.mk | 24 | ||||
| -rw-r--r-- | manifest.xml | 31 |
2 files changed, 18 insertions, 37 deletions
diff --git a/device-common.mk b/device-common.mk index 02e4795b..89682f85 100644 --- a/device-common.mk +++ b/device-common.mk @@ -34,7 +34,7 @@ endif # Set vendor kernel path PRODUCT_VENDOR_KERNEL_HEADERS := device/linaro/hikey/kernel-headers -PRODUCT_SHIPPING_API_LEVEL := 29 +PRODUCT_SHIPPING_API_LEVEL := 30 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false @@ -86,8 +86,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += vndk_package PRODUCT_PACKAGES += \ - android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service + android.hardware.drm@1.3-service.clearkey \ + android.hardware.drm@1.3-service.widevine \ # Graphics HAL PRODUCT_PACKAGES += \ @@ -108,10 +108,17 @@ else PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.btlinux endif -# PowerHAL +# +# Power HAL +# PRODUCT_PACKAGES += \ - android.hardware.power@1.1-impl \ - android.hardware.power@1.1-service.hikey-common + android.hardware.power-service.example + +# +# PowerStats HAL +# +PRODUCT_PACKAGES += \ + android.hardware.power.stats-service.example # Software Gatekeeper HAL @@ -246,7 +253,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \ + # 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 diff --git a/manifest.xml b/manifest.xml index 057240ca..ea3bf7a1 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ -<manifest version="1.0" type="device" target-level="4"> +<manifest version="1.0" type="device" target-level="5"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> @@ -41,18 +41,9 @@ <version>1.0</version> </hal> <hal format="hidl"> - <name>android.hardware.configstore</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>ISurfaceFlingerConfigs</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.3</version> <interface> <name>ICryptoFactory</name> <instance>default</instance> @@ -90,15 +81,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> @@ -130,15 +112,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.power</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IPower</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.renderscript</name> <transport arch="32+64">passthrough</transport> <version>1.0</version> |