am57xevm: Enable FULL_TREBLE

This patch sets ro.treble.enabled option to true, configures build and allows
board to boot to UI. for thi thing above need were done:
 - 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
 - Changed raw copying of device manifest with core build variable
 - Extended device manifest with missing hals

Change-Id: Id08af9a66d95bdf8496ce793eeef6060c519802c
Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
Acked-by: Praneeth Bajjuri <praneeth@ti.com>

4 files changed, 106 insertions, 14 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 017d2cd..2cad728 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,6 +25,11 @@ TARGET_BOOTIMAGE_FIT := true
 TARGET_NO_BOOTLOADER := true # We use externally built U-Boot
 TARGET_USES_64_BIT_BINDER := true
 
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+BOARD_VNDK_VERSION := current
+
+USE_CAMERA_STUB := true
+
 ENABLE_CPUSETS := true
 
 #BOARD_HAVE_BLUETOOTH := true
@@ -50,7 +55,12 @@ TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 
+DEVICE_MANIFEST_FILE := device/ti/am57xevm/manifest.xml
+DEVICE_MATRIX_FILE := device/ti/am57xevm/compatibility_matrix.xml
+
 TARGET_COPY_OUT_VENDOR := vendor
+TARGET_USES_HWC2 := true
+
 
 TARGET_RECOVERY_FSTAB = device/ti/am57xevm/fstab.am57xevmboard
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..659b8d3
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,58 @@
+<compatibility-matrix version="1.0" type="device">
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.displayservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDisplayService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.schedulerservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISchedulingPolicyService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.frameworks.sensorservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISensorManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hardware.graphics.composer</name>
+        <version>2.1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>vr</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.memory</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMapper</name>
+            <instance>ashmem</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hidl.token</name>
+        <version>1.0</version>
+        <interface>
+            <name>ITokenManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.system.wifi.keystore</name>
+        <version>1.0</version>
+        <interface>
+            <name>IKeystore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/device.mk b/device.mk
index fcc4c2c..caa2474 100644
--- a/device.mk
+++ b/device.mk
@@ -18,10 +18,13 @@
 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.drm@1.0-impl \
 	android.hardware.drm@1.0-service \
 	modetest \
+	libdrm_omap \
 	libdrm \
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -31,15 +34,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	hwui.render_dirty_regions=false \
 	persist.enable_task_snapshots=false \
 
-# Camera
-PRODUCT_PACKAGES += \
-	android.hardware.camera.provider@2.4-impl \
-	android.hardware.camera.provider@2.4-service \
-	camera_test \
-
-PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml \
-
 # All VNDK libraries (HAL interfaces, VNDK, VNDK-SP, LL-NDK)
 PRODUCT_PACKAGES += vndk_package
 
@@ -71,6 +65,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	wifi.interface=wlan0 \
 
+PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
+
 # USB
 PRODUCT_PACKAGES += \
 	android.hardware.usb@1.0-service \
@@ -148,14 +144,15 @@ endif
 
 PRODUCT_PACKAGES += \
 	android.hardware.memtrack@1.0-impl \
+	android.hardware.memtrack@1.0-service \
 	android.hardware.power@1.0-impl \
+	android.hardware.power@1.0-service \
 	android.hardware.keymaster@3.0-impl \
 	android.hardware.keymaster@3.0-service \
 
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \
 	device/ti/am57xevm/tablet_core_hardware_am57xevm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_am57xevm.xml \
-	device/ti/am57xevm/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
 	device/ti/am57xevm/init.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.rc \
 	device/ti/am57xevm/init.am57xevmboard.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.am57xevmboard.usb.rc \
 	device/ti/am57xevm/ueventd.am57xevmboard.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
diff --git a/manifest.xml b/manifest.xml
index d266ff1..540c0c3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -22,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>
@@ -31,6 +40,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>3.0</version>
+        <interface>
+            <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
         <version>2.0</version>
@@ -49,12 +67,12 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.camera.provider</name>
+        <name>android.hardware.memtrack</name>
         <transport>hwbinder</transport>
-        <version>2.4</version>
+        <version>1.0</version>
         <interface>
-            <name>ICameraProvider</name>
-            <instance>legacy/0</instance>
+            <name>IMemtrack</name>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
@@ -88,4 +106,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.gatekeeper</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IGatekeeper</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>