beagle-x15: Turn on FULL_TREBLE support

am: 240b7107c5

Change-Id: Ie5772e37985132f2def89e66650bfb3d37036901

7 files changed, 154 insertions, 12 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9c368e9..3b78403 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,11 +24,23 @@ TARGET_CPU_SMP := true
 TARGET_BOOTIMAGE_FIT := true
 TARGET_USES_64_BIT_BINDER := true
 
+#Treble
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+BOARD_VNDK_VERSION := current
+
 # Use mke2fs to create ext4 images
 TARGET_USES_MKE2FS := true
+TARGET_USES_HWC2 := true
+
+DEVICE_MANIFEST_FILE := device/ti/beagle_x15/manifest.xml
+DEVICE_MATRIX_FILE := device/ti/beagle_x15/compatibility_matrix.xml
+
+PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
 
 BOARD_FLASH_BLOCK_SIZE := 4096
 
+USE_CAMERA_STUB := true
+
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648 #   2GB
 BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 805306368  # 768MB
 BOARD_VENDORIMAGE_PARTITION_SIZE   := 268435456  # 256MB
diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
new file mode 100644
index 0000000..847f781
--- /dev/null
+++ b/compatibility_matrix.xml
@@ -0,0 +1,66 @@
+<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.hidl.manager</name>
+        <version>1.2</version>
+        <interface>
+            <name>IServiceManager</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <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.net.netd</name>
+        <version>1.1</version>
+        <interface>
+            <name>INetd</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 d5fc771..1530e5c 100644
--- a/device.mk
+++ b/device.mk
@@ -28,19 +28,27 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel
 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.graphics.mapper@2.0-service \
-	android.hardware.drm@1.0-impl \
-	android.hardware.drm@1.0-service \
+	android.hardware.graphics.composer@2.1-impl \
+	android.hardware.graphics.composer@2.1-service \
+	libdrm \
+	libdrm_omap \
+	hwcomposer.am57x \
+
+#Security
+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 \
+
+# Audio
+PRODUCT_PACKAGES += \
 	android.hardware.audio@2.0-impl \
+	android.hardware.audio@2.0-service \
 	android.hardware.audio.effect@2.0-impl \
-	libdrm \
-	libdrm_omap \
-        hwcomposer.am57x \
+	android.hardware.audio.effect@2.0-service \
 
 # Memtrack
 PRODUCT_PACKAGES += \
@@ -68,13 +76,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 PRODUCT_COPY_FILES += \
 	device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \
-	device/ti/beagle_x15/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
 	device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \
 	device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \
 	device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
 	device/ti/beagle_x15/fstab.beagle_x15board:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \
 	frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
 
+#FIXME: this feature should be turned off as soon as google start checking for WIFI support before wifi calls
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
+
 # Static modprobe for recovery image
 PRODUCT_PACKAGES += \
 	toybox_static \
diff --git a/manifest.xml b/manifest.xml
index f098ee2..034f2c3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,5 +1,32 @@
 <manifest version="1.0" type="device">
     <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio.effect</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IEffectsFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.configstore</name>
+        <transport>hwbinder</transport>
+        <version>1.0</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>
@@ -40,20 +67,33 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.memtrack</name>
+        <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.media.omx</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
-            <name>IMemtrack</name>
+            <name>IOmx</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IOmxStore</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.configstore</name>
+        <name>android.hardware.memtrack</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
-            <name>ISurfaceFlingerConfigs</name>
+            <name>IMemtrack</name>
             <instance>default</instance>
         </interface>
     </hal>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index c36cab0..2f4134c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -19,3 +19,13 @@
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/cache      u:object_r:cache_block_device:s0
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata   u:object_r:userdata_block_device:s0
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc       u:object_r:misc_block_device:s0
+
+/vendor/lib/libIMGegl.so			u:object_r:same_process_hal_file:s0
+/vendor/lib/libsrv_um.so			u:object_r:same_process_hal_file:s0
+/vendor/lib/libusc.so				u:object_r:same_process_hal_file:s0
+/vendor/lib/libpvrANDROID_WSEGL.so		u:object_r:same_process_hal_file:s0
+/vendor/lib/hw/gralloc.am57x.so			u:object_r:same_process_hal_file:s0
+/vendor/lib/libpvr2d.so				u:object_r:same_process_hal_file:s0
+/vendor/lib/libdrm_omap.so			u:object_r:same_process_hal_file:s0
+/vendor/lib/libdrm.so				u:object_r:same_process_hal_file:s0
+/vendor/lib/libglslcompiler.so			u:object_r:same_process_hal_file:s0
diff --git a/sepolicy/hal_drm_default.te b/sepolicy/hal_drm_default.te
new file mode 100644
index 0000000..5177496
--- /dev/null
+++ b/sepolicy/hal_drm_default.te
@@ -0,0 +1 @@
+vndbinder_use(hal_drm_default);
diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te
new file mode 100644
index 0000000..457f945
--- /dev/null
+++ b/sepolicy/hal_graphics_composer_default.te
@@ -0,0 +1,2 @@
+vndbinder_use(hal_graphics_composer_default);
+allow hal_graphics_composer_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;