diff --git a/Android.mk b/Android.mk index 387b694..54b7d5d 100644 --- a/Android.mk +++ b/Android.mk @@ -98,7 +98,8 @@ $(eval $(call define-redroid-prebuilt-etc,amdgpu.ids.redroid,,libdrm/amdgpu.ids, # libs with SOVERSION gbm_libs := libgbm.so.1 glapi_libs := libglapi.so.0 -libs = $(gbm_libs) $(glapi_libs) +expat_libs := libexpat.so.1 +libs = $(gbm_libs) $(glapi_libs) $(expat_libs) drm_libs := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib && find * -name 'libdrm*.so.*' -type l) libs += $(drm_libs) x264_libs := libx264.so.164 @@ -130,7 +131,7 @@ $(foreach lib,$(ffmpeg_libs),\ libs := libEGL_mesa libGLESv1_CM_mesa libGLESv2_mesa $(foreach lib,$(libs),\ $(eval $(call define-redroid-prebuilt-lib,$(lib),,egl/$(lib).so,egl,,\ - $(dri_libs) $(llvm_libs) $(glapi_libs) $(drm_libs)))) + $(dri_libs) $(llvm_libs) $(glapi_libs) $(drm_libs) $(expat_libs)))) # Vulkan diff --git a/prebuilts.mk b/prebuilts.mk index d692e5f..75a9d3c 100644 --- a/prebuilts.mk +++ b/prebuilts.mk @@ -5,6 +5,7 @@ PRODUCT_PACKAGES += \ libGLESv2_mesa \ vulkan.radeon \ vulkan.virtio \ + vulkan.lvp \ gralloc.cros \ gralloc.gbm \ ffmpeg \ diff --git a/prebuilts/aarch64/lib/dri/asahi_dri.so b/prebuilts/aarch64/lib/dri/asahi_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/asahi_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/etnaviv_dri.so b/prebuilts/aarch64/lib/dri/etnaviv_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/etnaviv_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/kms_swrast_dri.so b/prebuilts/aarch64/lib/dri/kms_swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/kms_swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/libgallium_dri.so b/prebuilts/aarch64/lib/dri/libgallium_dri.so index 03ef871..c806dd2 100755 Binary files a/prebuilts/aarch64/lib/dri/libgallium_dri.so and b/prebuilts/aarch64/lib/dri/libgallium_dri.so differ diff --git a/prebuilts/aarch64/lib/dri/libgallium_drv_video.so b/prebuilts/aarch64/lib/dri/libgallium_drv_video.so index 11acd35..8b2a344 100755 Binary files a/prebuilts/aarch64/lib/dri/libgallium_drv_video.so and b/prebuilts/aarch64/lib/dri/libgallium_drv_video.so differ diff --git a/prebuilts/aarch64/lib/dri/lima_dri.so b/prebuilts/aarch64/lib/dri/lima_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/lima_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/swrast_dri.so b/prebuilts/aarch64/lib/dri/swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/tegra_dri.so b/prebuilts/aarch64/lib/dri/tegra_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/tegra_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/vmwgfx_dri.so b/prebuilts/aarch64/lib/dri/vmwgfx_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/vmwgfx_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/dri/zink_dri.so b/prebuilts/aarch64/lib/dri/zink_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/aarch64/lib/dri/zink_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so b/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so index 329201f..4aa346f 100755 Binary files a/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so and b/prebuilts/aarch64/lib/hw/libvulkan_broadcom.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so b/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so index dcef195..001b5cd 100755 Binary files a/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so and b/prebuilts/aarch64/lib/hw/libvulkan_freedreno.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_lvp.so b/prebuilts/aarch64/lib/hw/libvulkan_lvp.so new file mode 100755 index 0000000..f3bb319 Binary files /dev/null and b/prebuilts/aarch64/lib/hw/libvulkan_lvp.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so b/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so index 12f8db0..07ed377 100755 Binary files a/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so and b/prebuilts/aarch64/lib/hw/libvulkan_panfrost.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_powervr_mesa.so b/prebuilts/aarch64/lib/hw/libvulkan_powervr_mesa.so new file mode 100755 index 0000000..256523f Binary files /dev/null and b/prebuilts/aarch64/lib/hw/libvulkan_powervr_mesa.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_radeon.so b/prebuilts/aarch64/lib/hw/libvulkan_radeon.so index 992aaac..30ce9a1 100755 Binary files a/prebuilts/aarch64/lib/hw/libvulkan_radeon.so and b/prebuilts/aarch64/lib/hw/libvulkan_radeon.so differ diff --git a/prebuilts/aarch64/lib/hw/libvulkan_virtio.so b/prebuilts/aarch64/lib/hw/libvulkan_virtio.so index 8b9ea1a..05f1305 100755 Binary files a/prebuilts/aarch64/lib/hw/libvulkan_virtio.so and b/prebuilts/aarch64/lib/hw/libvulkan_virtio.so differ diff --git a/prebuilts/aarch64/lib/libexpat.so b/prebuilts/aarch64/lib/libexpat.so new file mode 120000 index 0000000..5bb5d64 --- /dev/null +++ b/prebuilts/aarch64/lib/libexpat.so @@ -0,0 +1 @@ +libexpat.so.1 \ No newline at end of file diff --git a/prebuilts/aarch64/lib/libexpat.so.1 b/prebuilts/aarch64/lib/libexpat.so.1 new file mode 120000 index 0000000..11bb97a --- /dev/null +++ b/prebuilts/aarch64/lib/libexpat.so.1 @@ -0,0 +1 @@ +libexpat.so.1.6.7 \ No newline at end of file diff --git a/prebuilts/aarch64/lib/libexpat.so.1.6.7 b/prebuilts/aarch64/lib/libexpat.so.1.6.7 new file mode 100755 index 0000000..0714f48 Binary files /dev/null and b/prebuilts/aarch64/lib/libexpat.so.1.6.7 differ diff --git a/prebuilts/arm/lib/dri/asahi_dri.so b/prebuilts/arm/lib/dri/asahi_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/asahi_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/etnaviv_dri.so b/prebuilts/arm/lib/dri/etnaviv_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/etnaviv_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/kms_swrast_dri.so b/prebuilts/arm/lib/dri/kms_swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/kms_swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/libgallium_dri.so b/prebuilts/arm/lib/dri/libgallium_dri.so index 6c45f19..5534df1 100755 Binary files a/prebuilts/arm/lib/dri/libgallium_dri.so and b/prebuilts/arm/lib/dri/libgallium_dri.so differ diff --git a/prebuilts/arm/lib/dri/libgallium_drv_video.so b/prebuilts/arm/lib/dri/libgallium_drv_video.so index 6330df4..523aa65 100755 Binary files a/prebuilts/arm/lib/dri/libgallium_drv_video.so and b/prebuilts/arm/lib/dri/libgallium_drv_video.so differ diff --git a/prebuilts/arm/lib/dri/lima_dri.so b/prebuilts/arm/lib/dri/lima_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/lima_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/swrast_dri.so b/prebuilts/arm/lib/dri/swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/tegra_dri.so b/prebuilts/arm/lib/dri/tegra_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/tegra_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/vmwgfx_dri.so b/prebuilts/arm/lib/dri/vmwgfx_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/vmwgfx_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/dri/zink_dri.so b/prebuilts/arm/lib/dri/zink_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/arm/lib/dri/zink_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/arm/lib/hw/libvulkan_broadcom.so b/prebuilts/arm/lib/hw/libvulkan_broadcom.so index 2651ef2..cc0be6a 100755 Binary files a/prebuilts/arm/lib/hw/libvulkan_broadcom.so and b/prebuilts/arm/lib/hw/libvulkan_broadcom.so differ diff --git a/prebuilts/arm/lib/hw/libvulkan_freedreno.so b/prebuilts/arm/lib/hw/libvulkan_freedreno.so index 44c8efe..0b15b70 100755 Binary files a/prebuilts/arm/lib/hw/libvulkan_freedreno.so and b/prebuilts/arm/lib/hw/libvulkan_freedreno.so differ diff --git a/prebuilts/arm/lib/hw/libvulkan_lvp.so b/prebuilts/arm/lib/hw/libvulkan_lvp.so new file mode 100755 index 0000000..443cb60 Binary files /dev/null and b/prebuilts/arm/lib/hw/libvulkan_lvp.so differ diff --git a/prebuilts/arm/lib/hw/libvulkan_panfrost.so b/prebuilts/arm/lib/hw/libvulkan_panfrost.so index 8915afd..c51b807 100755 Binary files a/prebuilts/arm/lib/hw/libvulkan_panfrost.so and b/prebuilts/arm/lib/hw/libvulkan_panfrost.so differ diff --git a/prebuilts/arm/lib/hw/libvulkan_radeon.so b/prebuilts/arm/lib/hw/libvulkan_radeon.so index 03b27d3..e1a37ba 100755 Binary files a/prebuilts/arm/lib/hw/libvulkan_radeon.so and b/prebuilts/arm/lib/hw/libvulkan_radeon.so differ diff --git a/prebuilts/arm/lib/hw/libvulkan_virtio.so b/prebuilts/arm/lib/hw/libvulkan_virtio.so index b6e218c..9306346 100755 Binary files a/prebuilts/arm/lib/hw/libvulkan_virtio.so and b/prebuilts/arm/lib/hw/libvulkan_virtio.so differ diff --git a/prebuilts/arm/lib/libexpat.so b/prebuilts/arm/lib/libexpat.so new file mode 120000 index 0000000..5bb5d64 --- /dev/null +++ b/prebuilts/arm/lib/libexpat.so @@ -0,0 +1 @@ +libexpat.so.1 \ No newline at end of file diff --git a/prebuilts/arm/lib/libexpat.so.1 b/prebuilts/arm/lib/libexpat.so.1 new file mode 120000 index 0000000..11bb97a --- /dev/null +++ b/prebuilts/arm/lib/libexpat.so.1 @@ -0,0 +1 @@ +libexpat.so.1.6.7 \ No newline at end of file diff --git a/prebuilts/arm/lib/libexpat.so.1.6.7 b/prebuilts/arm/lib/libexpat.so.1.6.7 new file mode 100755 index 0000000..f5097f9 Binary files /dev/null and b/prebuilts/arm/lib/libexpat.so.1.6.7 differ diff --git a/prebuilts/x86/lib/dri/kms_swrast_dri.so b/prebuilts/x86/lib/dri/kms_swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86/lib/dri/kms_swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86/lib/dri/libgallium_dri.so b/prebuilts/x86/lib/dri/libgallium_dri.so index ebcb130..3edc6ed 100755 Binary files a/prebuilts/x86/lib/dri/libgallium_dri.so and b/prebuilts/x86/lib/dri/libgallium_dri.so differ diff --git a/prebuilts/x86/lib/dri/libgallium_drv_video.so b/prebuilts/x86/lib/dri/libgallium_drv_video.so index 0d952e8..f538daa 100755 Binary files a/prebuilts/x86/lib/dri/libgallium_drv_video.so and b/prebuilts/x86/lib/dri/libgallium_drv_video.so differ diff --git a/prebuilts/x86/lib/dri/swrast_dri.so b/prebuilts/x86/lib/dri/swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86/lib/dri/swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86/lib/dri/vmwgfx_dri.so b/prebuilts/x86/lib/dri/vmwgfx_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86/lib/dri/vmwgfx_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86/lib/dri/zink_dri.so b/prebuilts/x86/lib/dri/zink_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86/lib/dri/zink_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86/lib/hw/libvulkan_intel.so b/prebuilts/x86/lib/hw/libvulkan_intel.so index 631d327..633b1bd 100755 Binary files a/prebuilts/x86/lib/hw/libvulkan_intel.so and b/prebuilts/x86/lib/hw/libvulkan_intel.so differ diff --git a/prebuilts/x86/lib/hw/libvulkan_lvp.so b/prebuilts/x86/lib/hw/libvulkan_lvp.so new file mode 100755 index 0000000..4b4d74a Binary files /dev/null and b/prebuilts/x86/lib/hw/libvulkan_lvp.so differ diff --git a/prebuilts/x86/lib/hw/libvulkan_radeon.so b/prebuilts/x86/lib/hw/libvulkan_radeon.so index 3532b02..4c61433 100755 Binary files a/prebuilts/x86/lib/hw/libvulkan_radeon.so and b/prebuilts/x86/lib/hw/libvulkan_radeon.so differ diff --git a/prebuilts/x86/lib/hw/libvulkan_virtio.so b/prebuilts/x86/lib/hw/libvulkan_virtio.so index 8095b3d..78141ea 100755 Binary files a/prebuilts/x86/lib/hw/libvulkan_virtio.so and b/prebuilts/x86/lib/hw/libvulkan_virtio.so differ diff --git a/prebuilts/x86/lib/libexpat.so b/prebuilts/x86/lib/libexpat.so new file mode 120000 index 0000000..5bb5d64 --- /dev/null +++ b/prebuilts/x86/lib/libexpat.so @@ -0,0 +1 @@ +libexpat.so.1 \ No newline at end of file diff --git a/prebuilts/x86/lib/libexpat.so.1 b/prebuilts/x86/lib/libexpat.so.1 new file mode 120000 index 0000000..11bb97a --- /dev/null +++ b/prebuilts/x86/lib/libexpat.so.1 @@ -0,0 +1 @@ +libexpat.so.1.6.7 \ No newline at end of file diff --git a/prebuilts/x86/lib/libexpat.so.1.6.7 b/prebuilts/x86/lib/libexpat.so.1.6.7 new file mode 100755 index 0000000..e0da689 Binary files /dev/null and b/prebuilts/x86/lib/libexpat.so.1.6.7 differ diff --git a/prebuilts/x86_64/lib/dri/kms_swrast_dri.so b/prebuilts/x86_64/lib/dri/kms_swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86_64/lib/dri/kms_swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86_64/lib/dri/libgallium_dri.so b/prebuilts/x86_64/lib/dri/libgallium_dri.so index 1fd48e1..f97b79c 100755 Binary files a/prebuilts/x86_64/lib/dri/libgallium_dri.so and b/prebuilts/x86_64/lib/dri/libgallium_dri.so differ diff --git a/prebuilts/x86_64/lib/dri/libgallium_drv_video.so b/prebuilts/x86_64/lib/dri/libgallium_drv_video.so index e572255..f402530 100755 Binary files a/prebuilts/x86_64/lib/dri/libgallium_drv_video.so and b/prebuilts/x86_64/lib/dri/libgallium_drv_video.so differ diff --git a/prebuilts/x86_64/lib/dri/swrast_dri.so b/prebuilts/x86_64/lib/dri/swrast_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86_64/lib/dri/swrast_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86_64/lib/dri/vmwgfx_dri.so b/prebuilts/x86_64/lib/dri/vmwgfx_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86_64/lib/dri/vmwgfx_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86_64/lib/dri/zink_dri.so b/prebuilts/x86_64/lib/dri/zink_dri.so new file mode 120000 index 0000000..a396173 --- /dev/null +++ b/prebuilts/x86_64/lib/dri/zink_dri.so @@ -0,0 +1 @@ +libgallium_dri.so \ No newline at end of file diff --git a/prebuilts/x86_64/lib/hw/libvulkan_intel.so b/prebuilts/x86_64/lib/hw/libvulkan_intel.so index 261a14c..3eb12e9 100755 Binary files a/prebuilts/x86_64/lib/hw/libvulkan_intel.so and b/prebuilts/x86_64/lib/hw/libvulkan_intel.so differ diff --git a/prebuilts/x86_64/lib/hw/libvulkan_lvp.so b/prebuilts/x86_64/lib/hw/libvulkan_lvp.so new file mode 100755 index 0000000..3fc4019 Binary files /dev/null and b/prebuilts/x86_64/lib/hw/libvulkan_lvp.so differ diff --git a/prebuilts/x86_64/lib/hw/libvulkan_radeon.so b/prebuilts/x86_64/lib/hw/libvulkan_radeon.so index 286c541..a891f0a 100755 Binary files a/prebuilts/x86_64/lib/hw/libvulkan_radeon.so and b/prebuilts/x86_64/lib/hw/libvulkan_radeon.so differ diff --git a/prebuilts/x86_64/lib/hw/libvulkan_virtio.so b/prebuilts/x86_64/lib/hw/libvulkan_virtio.so index 2d06d4e..9840cbc 100755 Binary files a/prebuilts/x86_64/lib/hw/libvulkan_virtio.so and b/prebuilts/x86_64/lib/hw/libvulkan_virtio.so differ diff --git a/prebuilts/x86_64/lib/libexpat.so b/prebuilts/x86_64/lib/libexpat.so new file mode 120000 index 0000000..5bb5d64 --- /dev/null +++ b/prebuilts/x86_64/lib/libexpat.so @@ -0,0 +1 @@ +libexpat.so.1 \ No newline at end of file diff --git a/prebuilts/x86_64/lib/libexpat.so.1 b/prebuilts/x86_64/lib/libexpat.so.1 new file mode 120000 index 0000000..11bb97a --- /dev/null +++ b/prebuilts/x86_64/lib/libexpat.so.1 @@ -0,0 +1 @@ +libexpat.so.1.6.7 \ No newline at end of file diff --git a/prebuilts/x86_64/lib/libexpat.so.1.6.7 b/prebuilts/x86_64/lib/libexpat.so.1.6.7 new file mode 100755 index 0000000..c4021b3 Binary files /dev/null and b/prebuilts/x86_64/lib/libexpat.so.1.6.7 differ