Remove obsolete GL code from the device
This cleans up the egl.cfg and locking wrapper
Test: Local installclean, build, and boot
Change-Id: I33a008cb496bbfa296a13e1c17c18ab3a4f8f72c
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 53d12ea..57f66b9 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -32,7 +32,6 @@
USE_CAMERA_STUB := true
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-BOARD_EGL_CFG := device/google/cuttlefish/shared/config/egl.cfg
TARGET_USES_64_BIT_BINDER := true
# Hardware composer configuration
diff --git a/shared/config/egl.cfg b/shared/config/egl.cfg
deleted file mode 100644
index d9a1cfb..0000000
--- a/shared/config/egl.cfg
+++ /dev/null
@@ -1 +0,0 @@
-swiftshader
diff --git a/shared/device.mk b/shared/device.mk
index 313ab2d..9bbcb8a 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -105,20 +105,6 @@
libGLESv1_CM_swiftshader \
libGLESv2_swiftshader
-# The locking_wrapper puts a lock around all of the SwiftShader entry points to
-# serialize all access to the library, reducing the chances for races.
-# Applies only to guest-side SwiftShader
-PRODUCT_PACKAGES += \
- libEGL_locking_wrapper \
- libGLESv1_CM_locking_wrapper \
- libGLESv2_locking_wrapper
-
-# GLES encoder, reused from goldfish
-PRODUCT_PACKAGES += \
- libEGL_emulation \
- libGLESv1_CM_emulation \
- libGLESv2_emulation \
-
DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
PRODUCT_AAPT_CONFIG := normal large xlarge hdpi xhdpi
# PRODUCT_AAPT_PREF_CONFIG is intentionally not set to pick up every density resources.
