am65xevm: Enable PRODUCT_TREBLE

This patch sets ro.treble.enable=true

- turned on legacy PRODUCT_COMPATIBILITY_MATRIX_LEVEL
- Enabled FULL_TREBLE and vndk support in device*.mk
- Enforced VINFT manifest as part of treble requirements
- Added compatibility matrix to match device manifest and pass prebuild checks
- Added missing services for compatibility matrix
- Extended device manifest with missing hals
- removed unused audio packages
- re-arranged device*.mk and BoardConfig.mk

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

3 files changed, 38 insertions, 4 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a74a547..cc0ca4b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,12 +30,17 @@ TARGET_2ND_CPU_VARIANT := cortex-a53
 
 TARGET_BOOTIMAGE_FIT := true
 TARGET_NO_BOOTLOADER := true # We use externally built U-Boot
-PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := legacy
 TARGET_NO_RADIOIMAGE := true
 TARGET_NO_RECOVERY := true
 
+PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := legacy
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+BOARD_VNDK_VERSION := current
 TARGET_USES_64_BIT_BINDER := true
 
+TARGET_USES_HWC2 := true
+USE_CAMERA_STUB := true
+
 # Use mke2fs to create ext4 images
 TARGET_USES_MKE2FS := true
 
diff --git a/device-common.mk b/device-common.mk
index a71dbf0..3b38ee8 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -18,6 +18,8 @@
 PRODUCT_PACKAGES += \
         android.hardware.graphics.allocator@2.0-impl \
         android.hardware.graphics.allocator@2.0-service \
+        android.hardware.graphics.composer@2.1-impl \
+        android.hardware.graphics.composer@2.1-service \
         android.hardware.graphics.mapper@2.0-impl \
         android.hardware.memtrack@1.0-impl \
         android.hardware.memtrack@1.0-service \
@@ -25,15 +27,19 @@ PRODUCT_PACKAGES += \
         libdrm \
         libgbm \
 
+# All VNDK libraries (HAL interfaces, VNDK, VNDK-SP, LL-NDK)
+PRODUCT_PACKAGES += vndk_package
+
+PRODUCT_PACKAGES += \
+        libunwind
+
+PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
 # Audio
 PRODUCT_PACKAGES += \
         android.hardware.audio@2.0-impl \
         android.hardware.audio@2.0-service \
         android.hardware.audio.effect@2.0-impl \
         android.hardware.soundtrigger@2.0-impl \
-        audio.primary.default \
-        audio.a2dp.default \
-        audio.r_submix.default \
 
 # USB
 PRODUCT_PACKAGES += \
@@ -55,6 +61,7 @@ PRODUCT_COPY_FILES += \
         frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
         frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
 
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
         persist.sys.usb.config=mtp \
         ro.sf.lcd_density=160 \
diff --git a/manifest.xml b/manifest.xml
index 0bab05d..ad2d2d5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,5 +1,18 @@
 <manifest version="1.0" type="device">
     <hal format="hidl">
+        <name>android.hardware.drm</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ICryptoFactory</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IDrmFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
         <version>2.0</version>
@@ -9,6 +22,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>2.0</version>