summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2022-10-10 18:36:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-10 18:36:45 +0000
commit8aa9b1249ab3debd36ebcc3941cd60fddf6deef3 (patch)
treec1128a75f3019b36f7db5b49091e2474a36e3d66
parentcc5ff973b444df734169660d42b5734bcd043987 (diff)
parent178621d68d38f4768369092250491993ed1f5472 (diff)
downloadbeagle-x15-8aa9b1249ab3debd36ebcc3941cd60fddf6deef3.tar.gz
X15: Update PRODUCT_SHIPPING_API_LEVEL to 30 and FCM to 5 am: 69cfe72c7d am: 178621d68d
Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/2243381 Change-Id: I9376551ea19c836da19fc02e107ca1fefb1a31bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--device.mk23
-rw-r--r--manifest.xml22
2 files changed, 20 insertions, 25 deletions
diff --git a/device.mk b/device.mk
index ed2122a..5a34597 100644
--- a/device.mk
+++ b/device.mk
@@ -27,7 +27,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Adjust the dalvik heap to be appropriate for a tablet.
$(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
-PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_SHIPPING_API_LEVEL := 30
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
# Set custom settings
@@ -64,6 +64,17 @@ endif
TARGET_PREBUILT_KERNEL := $(LOCAL_KERNEL)
PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel
+#
+# Power HAL
+#
+PRODUCT_PACKAGES += \
+ android.hardware.power-service.example
+#
+# PowerStats HAL
+#
+PRODUCT_PACKAGES += \
+ android.hardware.power.stats-service.example
+
# Graphics
PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@2.0-impl \
@@ -72,8 +83,9 @@ PRODUCT_PACKAGES += \
android.hardware.graphics.mapper@2.0-service \
android.hardware.graphics.composer@2.1-impl \
android.hardware.graphics.composer@2.1-service \
- android.hardware.boot@1.0-impl:64 \
- android.hardware.boot@1.0-service \
+ android.hardware.boot@1.2-impl:64 \
+ android.hardware.boot@1.2-impl.recovery:64 \
+ android.hardware.boot@1.2-service \
android.hardware.fastboot@1.0 \
android.hardware.fastboot@1.0-impl-mock \
libdrm \
@@ -106,8 +118,9 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.keymaster@3.0-impl \
android.hardware.keymaster@3.0-service \
- 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 \
+
# Audio
PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index adf465f..bd5ef26 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>
@@ -18,18 +18,9 @@
</interface>
</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>
@@ -97,13 +88,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IBootControl</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>