commit 3c032070e30cfb0a7200d0dc666f4414a2b2424a
author Danny Lin <danny@kdrag0n.dev> Tue Dec 07 20:00:18 2021 -0800
committer Jack <jackeagle102@gmail.com> Sat Nov 18 12:38:22 2023 +0530
tree 23e3a6df4131c91496b563e5d579b32c289dbeb4
parent 6c63f7fdb6bd2641e2ad1a0fb1a0eb83389a5db3

Link to libOpenCL unconditionally when building OpenCL backend

We only build the OpenCL backend if libOpenCL has been extracted as a
prebuilt library in vendor/google_devices, so relax the check and
assume that libOpenCL is available for linking.

Change-Id: I5399fc04be7b4b8f29e586b857a1d520a41ddd02
(cherry picked from commit 5631c3efa71fb2f592ef3fc0fcdd8692f1cb5fc8)
Reviewed-on: https://review.blissroms.org/c/platform_external_android-nn-driver/+/18921
Tested-by: Jack <jackeagle102@gmail.com>
Reviewed-by: Jack <jackeagle102@gmail.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 06c653d..45ac94b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -179,12 +179,8 @@
 endif # R or later
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -310,12 +306,8 @@
 endif # R or later
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -436,12 +428,8 @@
 endif # R or later
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -557,12 +545,8 @@
         android.hardware.neuralnetworks@1.3
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -665,12 +649,8 @@
 endif # R or later
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 include $(BUILD_EXECUTABLE)
 
@@ -766,12 +746,8 @@
 endif # PLATFORM_VERSION == R
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
 endif
-endif
 
 ifeq ($(R_OR_LATER),1)
 LOCAL_SHARED_LIBRARIES+= android.hardware.neuralnetworks@1.3
@@ -869,11 +845,7 @@
 endif # R or later
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
-endif
 
 
 LOCAL_LDFLAGS_32 := -Wl,-rpath,/vendor/lib/egl
@@ -958,11 +930,7 @@
         android.hardware.neuralnetworks@1.3
 
 ifeq ($(ARMNN_INCLUDE_LIBOPENCL),1)
-ifeq (,$(realpath $(TOPDIR)vendor/arm/mali/valhall/Android.bp))
-    LOCAL_SHARED_LIBRARIES += libGLES_mali
-else
     LOCAL_SHARED_LIBRARIES += libOpenCL
-endif
 LOCAL_LDFLAGS_32 := -Wl,-rpath,/vendor/lib/egl
 LOCAL_LDFLAGS_64 := -Wl,-rpath,/vendor/lib64/egl
 endif