Merge changes from topic "cf-swiftshader-vk"
* changes:
Advertise Vulkan feature bits in Cuttlefish
Forward ro.hardware.vulkan prop during init
Set sepolicy for SwiftShader VK
Install SwiftShader's Vulkan lib in Cuttlefish
diff --git a/shared/config/init.common.rc b/shared/config/init.common.rc
index f245273..b25b916 100644
--- a/shared/config/init.common.rc
+++ b/shared/config/init.common.rc
@@ -13,6 +13,7 @@
setprop ro.hardware.egl ${ro.boot.hardware.egl}
setprop ro.hardware.gralloc ${ro.boot.hardware.gralloc}
setprop ro.hardware.hwcomposer ${ro.boot.hardware.hwcomposer}
+ setprop ro.hardware.vulkan ${ro.boot.hardware.vulkan}
# start module load in the background
start vendor.insmod_sh
diff --git a/shared/device.mk b/shared/device.mk
index 3f570b4..f68d2c5 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -101,6 +101,12 @@
PRODUCT_PACKAGES += \
libGLES_mesa
+#
+# Packages for the Vulkan implementation
+#
+PRODUCT_PACKAGES += \
+ vulkan.pastel
+
DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
# PRODUCT_AAPT_CONFIG and PRODUCT_AAPT_PREF_CONFIG are intentionally not set to
# pick up every density resources.
@@ -145,6 +151,8 @@
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.touchscreen.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
+ frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
system/bt/vendor_libs/test_vendor_lib/data/controller_properties.json:vendor/etc/bluetooth/controller_properties.json \
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index fd3305e..d58dac3 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -83,5 +83,6 @@
/vendor/lib(64)?/android\.hardware\.health@2\.1-impl-cuttlefish u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc.cutf_ashmem.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc.minigbm.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/vulkan.pastel.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libcuttlefish_fs.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/vsoc_lib.so u:object_r:same_process_hal_file:s0
diff --git a/shared/sepolicy/vendor/property_contexts b/shared/sepolicy/vendor/property_contexts
index aa30cd7..ac64ad9 100644
--- a/shared/sepolicy/vendor/property_contexts
+++ b/shared/sepolicy/vendor/property_contexts
@@ -8,6 +8,7 @@
ro.boot.hardware.egl u:object_r:cf_graphics_config_prop:s0 exact string
ro.boot.hardware.gralloc u:object_r:cf_graphics_config_prop:s0 exact string
ro.boot.hardware.hwcomposer u:object_r:cf_graphics_config_prop:s0 exact string
+ro.boot.hardware.vulkan u:object_r:cf_graphics_config_prop:s0 exact string
ro.boot.lcd_density u:object_r:cf_graphics_config_prop:s0 exact int
ro.boot.vsock_frames_port u:object_r:vsock_frames_port_prop:s0
ro.boot.vsock_keyboard_port u:object_r:cuttlefish_vsock_keyboard_port:s0