From b2055fb87a9aee4e9584b13550ecd3cecf173e81 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 27 Apr 2017 11:43:11 -0700 Subject: [PATCH] wahoo/muskie: advertise vulkan support Adds vulkan support level and version to system/etc/permissions; fixes sepolicy so the vulkan driver can load. Fixes tests in android.graphics.cts.VulkanFeaturesTest: - testVulkanHardwareFeatures - testVulkanVersionForVrHighPerformance sepolicy change mostly borrowed from equivalent marlin config Test: CtsGraphicsTestCases/android.graphics.cts.VulkanFeaturesTest Bug: b/37719307 Change-Id: Ia99d6dacc8d8353cb7ef0e1cfaca0636708c5067 --- device.mk | 2 ++ sepolicy/file_contexts | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/device.mk b/device.mk index 8dbbf32e..cdc3fc1e 100644 --- a/device.mk +++ b/device.mk @@ -149,6 +149,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:system/etc/permissions/android.hardware.nfc.hcef.xml \ frameworks/native/data/etc/android.hardware.vr.headtracking-0.xml:system/etc/permissions/android.hardware.vr.headtracking.xml \ frameworks/native/data/etc/android.hardware.vr.high_performance.xml:system/etc/permissions/android.hardware.vr.high_performance.xml \ + frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:system/etc/permissions/android.hardware.vulkan.level.xml \ + frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/init.power.sh:system/bin/init.power.sh \ diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index ff9a93b0..7ff03f77 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -223,6 +223,11 @@ /vendor/lib(64)?/libadreno_utils\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libgsl\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/hw/vulkan\.msm8998\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libEGL_adreno\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libGLESv1_CM_adreno\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libGLESv2_adreno\.so u:object_r:same_process_hal_file:s0 + /vendor/lib(64)?/libdrmutils\.so u:object_r:same_process_hal_file:s0 # /vendor/app/TimeService/TimeService.apk @@ -233,6 +238,7 @@ # To test: run cts -m CtsRenderscriptTestCases /vendor/lib(64)?/libRSDriver_adreno\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libCB\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libllvm-qgl\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libbccQTI\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libllvm-qcom\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/librs_adreno\.so u:object_r:same_process_hal_file:s0