Put guest-side SwiftShader into the default position
BUG: 124892917
Test: Boot and draws
Change-Id: I50df8ae4334d0cd6be88e317e60884b587a2f587
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 57f66b9..a2abb0d 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -76,8 +76,6 @@
USE_OPENGL_RENDERER := true
-BOARD_SWIFTSHADER_RELATIVE_PATH := gl_impl/swiftshader
-
# Wifi.
BOARD_WLAN_DEVICE := wlan0
BOARD_HOSTAPD_DRIVER := NL80211
diff --git a/shared/config/README_egl.md b/shared/config/README_egl.md
deleted file mode 100644
index 1cee739..0000000
--- a/shared/config/README_egl.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# EGL placeholder
-
-This is a placeholder for the actual egl implementation. Normally init would
-have bind mounted the actual implementation here in the early boot.
diff --git a/shared/device.mk b/shared/device.mk
index 9bbcb8a..f100be1 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -95,11 +95,7 @@
# Packages for the OpenGL implementation
#
-# Placeholder to ensure that /vendor/lib/egl exists
-PRODUCT_COPY_FILES += \
- device/google/cuttlefish/shared/config/README_egl.md:$(TARGET_COPY_OUT_VENDOR)/lib/egl/README.md
-
-# Guest side SwiftShader
+# SwiftShader provides a software-only implementation that is not thread-safe
PRODUCT_PACKAGES += \
libEGL_swiftshader \
libGLESv1_CM_swiftshader \
