summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykhailo Sopiha2018-08-03 08:11:17 -0500
committerAlistair Strachan2018-09-27 15:02:21 -0500
commit240b7107c506dc7bb210ff2667dcd6fd962f3bb2 (patch)
tree33a6246e9a51ff1f5ac1d4c578ef9e4a664083b4
parentb68d16448b294a12c60c1618622a116b3164cd5a (diff)
downloaddevice-ti-beagle-x15-240b7107c506dc7bb210ff2667dcd6fd962f3bb2.tar.gz
device-ti-beagle-x15-240b7107c506dc7bb210ff2667dcd6fd962f3bb2.tar.xz
device-ti-beagle-x15-240b7107c506dc7bb210ff2667dcd6fd962f3bb2.zip
beagle-x15: Turn on FULL_TREBLE support
Next changes are made: - Add device compatibility matrix - Update device manifest - Turn on treble and vndk support - Update product packages - Update SEPolicy Change-Id: I6e5d416948fbe391073cbda97df19b65c4cbf549 Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
-rw-r--r--BoardConfig.mk12
-rw-r--r--compatibility_matrix.xml66
-rw-r--r--device.mk27
-rw-r--r--manifest.xml48
-rw-r--r--sepolicy/file_contexts10
-rw-r--r--sepolicy/hal_drm_default.te1
-rw-r--r--sepolicy/hal_graphics_composer_default.te2
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
24TARGET_BOOTIMAGE_FIT := true 24TARGET_BOOTIMAGE_FIT := true
25TARGET_USES_64_BIT_BINDER := true 25TARGET_USES_64_BIT_BINDER := true
26 26
27#Treble
28PRODUCT_FULL_TREBLE_OVERRIDE := true
29BOARD_VNDK_VERSION := current
30
27# Use mke2fs to create ext4 images 31# Use mke2fs to create ext4 images
28TARGET_USES_MKE2FS := true 32TARGET_USES_MKE2FS := true
33TARGET_USES_HWC2 := true
34
35DEVICE_MANIFEST_FILE := device/ti/beagle_x15/manifest.xml
36DEVICE_MATRIX_FILE := device/ti/beagle_x15/compatibility_matrix.xml
37
38PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
29 39
30BOARD_FLASH_BLOCK_SIZE := 4096 40BOARD_FLASH_BLOCK_SIZE := 4096
31 41
42USE_CAMERA_STUB := true
43
32BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648 # 2GB 44BOARD_USERDATAIMAGE_PARTITION_SIZE := 2147483648 # 2GB
33BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB 45BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB
34BOARD_VENDORIMAGE_PARTITION_SIZE := 268435456 # 256MB 46BOARD_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 @@
1<compatibility-matrix version="1.0" type="device">
2 <hal format="hidl" optional="false">
3 <name>android.frameworks.displayservice</name>
4 <version>1.0</version>
5 <interface>
6 <name>IDisplayService</name>
7 <instance>default</instance>
8 </interface>
9 </hal>
10 <hal format="hidl" optional="false">
11 <name>android.frameworks.schedulerservice</name>
12 <version>1.0</version>
13 <interface>
14 <name>ISchedulingPolicyService</name>
15 <instance>default</instance>
16 </interface>
17 </hal>
18 <hal format="hidl" optional="false">
19 <name>android.frameworks.sensorservice</name>
20 <version>1.0</version>
21 <interface>
22 <name>ISensorManager</name>
23 <instance>default</instance>
24 </interface>
25 </hal>
26 <hal format="hidl" optional="false">
27 <name>android.hidl.manager</name>
28 <version>1.2</version>
29 <interface>
30 <name>IServiceManager</name>
31 <instance>default</instance>
32 </interface>
33 </hal>
34 <hal format="hidl" optional="true">
35 <name>android.hidl.memory</name>
36 <version>1.0</version>
37 <interface>
38 <name>IMapper</name>
39 <instance>ashmem</instance>
40 </interface>
41 </hal>
42 <hal format="hidl" optional="false">
43 <name>android.hidl.token</name>
44 <version>1.0</version>
45 <interface>
46 <name>ITokenManager</name>
47 <instance>default</instance>
48 </interface>
49 </hal>
50 <hal format="hidl" optional="false">
51 <name>android.system.net.netd</name>
52 <version>1.1</version>
53 <interface>
54 <name>INetd</name>
55 <instance>default</instance>
56 </interface>
57 </hal>
58 <hal format="hidl" optional="false">
59 <name>android.system.wifi.keystore</name>
60 <version>1.0</version>
61 <interface>
62 <name>IKeystore</name>
63 <instance>default</instance>
64 </interface>
65 </hal>
66</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
28PRODUCT_PACKAGES += \ 28PRODUCT_PACKAGES += \
29 android.hardware.graphics.allocator@2.0-impl \ 29 android.hardware.graphics.allocator@2.0-impl \
30 android.hardware.graphics.allocator@2.0-service \ 30 android.hardware.graphics.allocator@2.0-service \
31 android.hardware.graphics.composer@2.1-impl \
32 android.hardware.graphics.composer@2.1-service \
33 android.hardware.graphics.mapper@2.0-impl \ 31 android.hardware.graphics.mapper@2.0-impl \
34 android.hardware.graphics.mapper@2.0-service \ 32 android.hardware.graphics.mapper@2.0-service \
35 android.hardware.drm@1.0-impl \ 33 android.hardware.graphics.composer@2.1-impl \
36 android.hardware.drm@1.0-service \ 34 android.hardware.graphics.composer@2.1-service \
35 libdrm \
36 libdrm_omap \
37 hwcomposer.am57x \
38
39#Security
40PRODUCT_PACKAGES += \
37 android.hardware.keymaster@3.0-impl \ 41 android.hardware.keymaster@3.0-impl \
38 android.hardware.keymaster@3.0-service \ 42 android.hardware.keymaster@3.0-service \
43 android.hardware.drm@1.0-impl \
44 android.hardware.drm@1.0-service \
45
46# Audio
47PRODUCT_PACKAGES += \
39 android.hardware.audio@2.0-impl \ 48 android.hardware.audio@2.0-impl \
49 android.hardware.audio@2.0-service \
40 android.hardware.audio.effect@2.0-impl \ 50 android.hardware.audio.effect@2.0-impl \
41 libdrm \ 51 android.hardware.audio.effect@2.0-service \
42 libdrm_omap \
43 hwcomposer.am57x \
44 52
45# Memtrack 53# Memtrack
46PRODUCT_PACKAGES += \ 54PRODUCT_PACKAGES += \
@@ -68,13 +76,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
68 76
69PRODUCT_COPY_FILES += \ 77PRODUCT_COPY_FILES += \
70 device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \ 78 device/ti/beagle_x15/tablet_core_hardware_beagle_x15.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware_beagle_x15.xml \
71 device/ti/beagle_x15/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
72 device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \ 79 device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \
73 device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \ 80 device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \
74 device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ 81 device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
75 device/ti/beagle_x15/fstab.beagle_x15board:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \ 82 device/ti/beagle_x15/fstab.beagle_x15board:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \
76 frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ 83 frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
77 84
85#FIXME: this feature should be turned off as soon as google start checking for WIFI support before wifi calls
86PRODUCT_COPY_FILES += \
87 frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
88
78# Static modprobe for recovery image 89# Static modprobe for recovery image
79PRODUCT_PACKAGES += \ 90PRODUCT_PACKAGES += \
80 toybox_static \ 91 toybox_static \
diff --git a/manifest.xml b/manifest.xml
index f098ee2..034f2c3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,5 +1,32 @@
1<manifest version="1.0" type="device"> 1<manifest version="1.0" type="device">
2 <hal format="hidl"> 2 <hal format="hidl">
3 <name>android.hardware.audio</name>
4 <transport>hwbinder</transport>
5 <version>2.0</version>
6 <interface>
7 <name>IDevicesFactory</name>
8 <instance>default</instance>
9 </interface>
10 </hal>
11 <hal format="hidl">
12 <name>android.hardware.audio.effect</name>
13 <transport>hwbinder</transport>
14 <version>2.0</version>
15 <interface>
16 <name>IEffectsFactory</name>
17 <instance>default</instance>
18 </interface>
19 </hal>
20 <hal format="hidl">
21 <name>android.hardware.configstore</name>
22 <transport>hwbinder</transport>
23 <version>1.0</version>
24 <interface>
25 <name>ISurfaceFlingerConfigs</name>
26 <instance>default</instance>
27 </interface>
28 </hal>
29 <hal format="hidl">
3 <name>android.hardware.drm</name> 30 <name>android.hardware.drm</name>
4 <transport>hwbinder</transport> 31 <transport>hwbinder</transport>
5 <version>1.0</version> 32 <version>1.0</version>
@@ -40,20 +67,33 @@
40 </interface> 67 </interface>
41 </hal> 68 </hal>
42 <hal format="hidl"> 69 <hal format="hidl">
43 <name>android.hardware.memtrack</name> 70 <name>android.hardware.keymaster</name>
71 <transport>hwbinder</transport>
72 <version>3.0</version>
73 <interface>
74 <name>IKeymasterDevice</name>
75 <instance>default</instance>
76 </interface>
77 </hal>
78 <hal format="hidl">
79 <name>android.hardware.media.omx</name>
44 <transport>hwbinder</transport> 80 <transport>hwbinder</transport>
45 <version>1.0</version> 81 <version>1.0</version>
46 <interface> 82 <interface>
47 <name>IMemtrack</name> 83 <name>IOmx</name>
84 <instance>default</instance>
85 </interface>
86 <interface>
87 <name>IOmxStore</name>
48 <instance>default</instance> 88 <instance>default</instance>
49 </interface> 89 </interface>
50 </hal> 90 </hal>
51 <hal format="hidl"> 91 <hal format="hidl">
52 <name>android.hardware.configstore</name> 92 <name>android.hardware.memtrack</name>
53 <transport>hwbinder</transport> 93 <transport>hwbinder</transport>
54 <version>1.0</version> 94 <version>1.0</version>
55 <interface> 95 <interface>
56 <name>ISurfaceFlingerConfigs</name> 96 <name>IMemtrack</name>
57 <instance>default</instance> 97 <instance>default</instance>
58 </interface> 98 </interface>
59 </hal> 99 </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 @@
19/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/cache u:object_r:cache_block_device:s0 19/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/cache u:object_r:cache_block_device:s0
20/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata u:object_r:userdata_block_device:s0 20/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata u:object_r:userdata_block_device:s0
21/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc u:object_r:misc_block_device:s0 21/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc u:object_r:misc_block_device:s0
22
23/vendor/lib/libIMGegl.so u:object_r:same_process_hal_file:s0
24/vendor/lib/libsrv_um.so u:object_r:same_process_hal_file:s0
25/vendor/lib/libusc.so u:object_r:same_process_hal_file:s0
26/vendor/lib/libpvrANDROID_WSEGL.so u:object_r:same_process_hal_file:s0
27/vendor/lib/hw/gralloc.am57x.so u:object_r:same_process_hal_file:s0
28/vendor/lib/libpvr2d.so u:object_r:same_process_hal_file:s0
29/vendor/lib/libdrm_omap.so u:object_r:same_process_hal_file:s0
30/vendor/lib/libdrm.so u:object_r:same_process_hal_file:s0
31/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 @@
1vndbinder_use(hal_graphics_composer_default);
2allow hal_graphics_composer_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;