commit 21c32402a615b63f764aa5c6fd419c8378b3ec74
author Cole Faust <colefaust@google.com> Fri Oct 13 21:42:38 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 13 21:42:38 2023 +0000
tree 517cfd7d80ac803069c8be1833ef5c340ad851d6
parent 6ec2d7334700768950a1cee01eaf753805b8d589
parent 9246129559c6fbd39332e35b771ce9848c3568ce

Use install_symlink to add symlinks am: 92b51f2bbb am: 9246129559

Original change: https://android-review.googlesource.com/c/device/amlogic/yukawa/+/2786433

Change-Id: Ie9152f66f278492e60051b32645c94e131dd8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

binaries/gpu/Android.bp

diff --git a/binaries/gpu/Android.bp b/binaries/gpu/Android.bp
new file mode 100644
index 0000000..8423c3f
--- /dev/null
+++ b/binaries/gpu/Android.bp
@@ -0,0 +1,57 @@
+
+
+install_symlink {
+    name: "yukawa_libGLES_mali_vulkan_symlink32",
+    vendor: true,
+    installed_location: "lib/hw/vulkan.yukawa.so",
+    symlink_target: "../egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_vulkan_symlink64",
+    vendor: true,
+    installed_location: "lib64/hw/vulkan.yukawa.so",
+    symlink_target: "../egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so.1",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink32",
+    vendor: true,
+    installed_location: "lib/libOpenCL.so.1.1",
+    symlink_target: "egl/libGLES_mali.so",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so.1",
+    symlink_target: "libOpenCL.so.1.1",
+}
+
+install_symlink {
+    name: "yukawa_libGLES_mali_libOpenCL.1.1_symlink64",
+    vendor: true,
+    installed_location: "lib64/libOpenCL.so.1.1",
+    symlink_target: "egl/libGLES_mali.so",
+}
\ No newline at end of file

binaries/gpu/Android.mk

diff --git a/binaries/gpu/Android.mk b/binaries/gpu/Android.mk
index f989461..63de7e5 100755
--- a/binaries/gpu/Android.mk
+++ b/binaries/gpu/Android.mk
@@ -35,19 +35,17 @@
 LOCAL_STRIP_MODULE := false
 
 ifeq ($(BOARD_INSTALL_VULKAN),true)
-LOCAL_POST_INSTALL_CMD = $(hide) \
-    pushd $(dir $(LOCAL_INSTALLED_MODULE))../hw && \
-        ln -sf ../egl/$(notdir $(LOCAL_INSTALLED_MODULE)) vulkan.$(TARGET_DEVICE).so && \
-        popd;
+LOCAL_REQUIRED_MODULES += yukawa_libGLES_mali_vulkan_symlink32 yukawa_libGLES_mali_vulkan_symlink64
 endif
 
 ifeq ($(BOARD_INSTALL_OPENCL),true)
-LOCAL_POST_INSTALL_CMD += \
-    pushd $(dir $(LOCAL_INSTALLED_MODULE)).. && \
-        ln -sf egl/$(notdir $(LOCAL_INSTALLED_MODULE)) libOpenCL.so.1.1 && \
-        ln -sf libOpenCL.so.1.1 libOpenCL.so.1 && \
-        ln -sf libOpenCL.so.1.1 libOpenCL.so && \
-        popd;
+LOCAL_REQUIRED_MODULES += \
+    yukawa_libGLES_mali_libOpenCL_symlink32 \
+    yukawa_libGLES_mali_libOpenCL.1_symlink32 \
+    yukawa_libGLES_mali_libOpenCL.1.1_symlink32 \
+    yukawa_libGLES_mali_libOpenCL_symlink64 \
+    yukawa_libGLES_mali_libOpenCL.1_symlink64 \
+    yukawa_libGLES_mali_libOpenCL.1.1_symlink64
 endif
 
 include $(BUILD_PREBUILT)