From 5255afcd4dce4b182a245d221fc9013058a052fc Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 28 Mar 2024 13:11:44 +0000
Subject: [PATCH] sm6150-common: Declare EGL libs as symlinks during extraction

Change-Id: I4b2f3e79b5e518889d9771bf8990e27babca8b61
---
 Android.mk            | 16 ----------------
 proprietary-files.txt | 12 ++++++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/Android.mk b/Android.mk
index 59c7536..d52b344 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,22 +41,6 @@ $(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
 
-EGL_SYMLINKS := $(TARGET_OUT_VENDOR)/lib/
-$(EGL_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	mkdir -p $@
-	$(hide) ln -sf egl/libEGL_adreno.so $@/libEGL_adreno.so
-	$(hide) ln -sf egl/libGLESv2_adreno.so $@/libGLESv2_adreno.so
-
-ALL_DEFAULT_INSTALLED_MODULES += $(EGL_SYMLINKS)
-
-EGL64_SYMLINKS := $(TARGET_OUT_VENDOR)/lib64/
-$(EGL64_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	mkdir -p $@
-	$(hide) ln -sf egl/libEGL_adreno.so $@/libEGL_adreno.so
-	$(hide) ln -sf egl/libGLESv2_adreno.so $@/libGLESv2_adreno.so
-
-ALL_DEFAULT_INSTALLED_MODULES += $(EGL64_SYMLINKS)
-
 WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/
 $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "Creating wifi firmware symlinks: $@"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f77c0ba..b643604 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -196,10 +196,10 @@ vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
 
 # Graphics
 -vendor/lib/egl/eglSubDriverAndroid.so
--vendor/lib/egl/libEGL_adreno.so
+-vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so
 -vendor/lib/egl/libGLESv1_CM_adreno.so
--vendor/lib/egl/libGLESv2_adreno.so
--vendor/lib/egl/libq3dtools_adreno.so
+-vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so
+-vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so
 -vendor/lib/egl/libq3dtools_esx.so
 -vendor/lib/hw/vulkan.adreno.so
 -vendor/lib/libC2D2.so
@@ -211,10 +211,10 @@ vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy
 -vendor/lib/libllvm-glnext.so
 -vendor/lib/libllvm-qcom.so
 -vendor/lib64/egl/eglSubDriverAndroid.so
--vendor/lib64/egl/libEGL_adreno.so
+-vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so
 -vendor/lib64/egl/libGLESv1_CM_adreno.so
--vendor/lib64/egl/libGLESv2_adreno.so
--vendor/lib64/egl/libq3dtools_adreno.so
+-vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so
+-vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so
 -vendor/lib64/egl/libq3dtools_esx.so
 -vendor/lib64/hw/vulkan.adreno.so
 -vendor/lib64/libC2D2.so