PD#123871 gpu lib: update so for different android version

Change-Id: I75d64ffdbaeb753e399e8ffbb50bd750217ee30c

diff --git a/gpu.mk b/gpu.mk
index 3d56ed6e826b8570a85d3c4a1bade8599cc6b5e9..ed779e4accfef01bedfd0a8974c7408767a75b77 100644 (file)
--- a/gpu.mk
+++ b/gpu.mk
@@ -64,4 +64,4 @@ $(MALI_KO):
 endef
 endif
 $(info local path is $(LOCAL_PATH))
-include hardware/arm/gpu/lib/lib.mk
+#include hardware/arm/gpu/lib/lib.mk

diff --git a/lib/Android.mk b/lib/Android.mk
new file mode 120000 (symlink)
index 0000000..35cfd1d
--- /dev/null
+++ b/lib/Android.mk
@@ -0,0 +1 @@
+lib.mk
\ No newline at end of file

diff --git a/lib/lib.mk b/lib/lib.mk
index 0c42188dcb8e5ae11ba5e6b8ee5e62abc41b6b4f..ebabf02ed9d35f4a5e7bf6005f4812de967050ad 100755 (executable)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -11,7 +11,8 @@ endif
 #already in hardware/arm/gpu/lib
 
 ifeq ($(MALI_LIB_PREBUILT),true)
-LOCAL_PATH:=$(call my-dir)
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
 
 TARGET:=$(GPU_TYPE)
 TARGET?=mali400
@@ -21,20 +22,27 @@ endif
 
 TARGET:=$(TARGET)_ion
 GPU_TARGET_PLATFORM ?= default_7a
-#$(error TARGET=$(TARGET) USING_ION=$(USING_ION))
 
-include $(CLEAR_VARS)
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23 && echo OK),OK)
+LOCAL_ANDROID_VERSION_NUM:=m
+else
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 22 && echo OK),OK)
+LOCAL_ANDROID_VERSION_NUM:=l
+else
+LOCAL_ANDROID_VERSION_NUM:=k
+endif
+endif
 LOCAL_MODULE := libGLES_mali
 LOCAL_MULTILIB := both
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH    := $(TARGET_OUT_SHARED_LIBRARIES)/egl
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib/egl
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64/egl
-LOCAL_SRC_FILES_arm   := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_32.so
-LOCAL_SRC_FILES_arm64 := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_64.so
-#$(info src file is $(LOCAL_SRC_FILES_arm))
-#$(info src file is $(LOCAL_SRC_FILES_arm64))
+LOCAL_SRC_FILES       := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_32-$(LOCAL_ANDROID_VERSION_NUM).so
+LOCAL_SRC_FILES_arm   := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_32-$(LOCAL_ANDROID_VERSION_NUM).so
+LOCAL_SRC_FILES_arm64 := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_64-$(LOCAL_ANDROID_VERSION_NUM).so
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)

diff --git a/lib/mali450_ion/libGLES_mali_default_7a_32-k.so b/lib/mali450_ion/libGLES_mali_default_7a_32-k.so
new file mode 100644 (file)
index 0000000..e73bf7e
Binary files /dev/null and b/lib/mali450_ion/libGLES_mali_default_7a_32-k.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_7a_32-l.so b/lib/mali450_ion/libGLES_mali_default_7a_32-l.so
new file mode 120000 (symlink)
index 0000000..54f3789
--- /dev/null
+++ b/lib/mali450_ion/libGLES_mali_default_7a_32-l.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-l.so
\ No newline at end of file

diff --git a/lib/mali450_ion/libGLES_mali_default_7a_32-m.so b/lib/mali450_ion/libGLES_mali_default_7a_32-m.so
new file mode 120000 (symlink)
index 0000000..280a247
--- /dev/null
+++ b/lib/mali450_ion/libGLES_mali_default_7a_32-m.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-m.so
\ No newline at end of file

diff --git a/lib/mali450_ion/libGLES_mali_default_7a_32.so b/lib/mali450_ion/libGLES_mali_default_7a_32.so
deleted file mode 120000 (symlink)
index 4c92be9..0000000
--- a/lib/mali450_ion/libGLES_mali_default_7a_32.so
+++ /dev/null
@@ -1 +0,0 @@
-libGLES_mali_default_8a_32.so
\ No newline at end of file

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_32-l.so b/lib/mali450_ion/libGLES_mali_default_8a_32-l.so
new file mode 100644 (file)
index 0000000..23dfd32
Binary files /dev/null and b/lib/mali450_ion/libGLES_mali_default_8a_32-l.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_32-m.so b/lib/mali450_ion/libGLES_mali_default_8a_32-m.so
new file mode 100644 (file)
index 0000000..1ced703
Binary files /dev/null and b/lib/mali450_ion/libGLES_mali_default_8a_32-m.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_32.so b/lib/mali450_ion/libGLES_mali_default_8a_32.so
deleted file mode 100644 (file)
index 0771a88..0000000
Binary files a/lib/mali450_ion/libGLES_mali_default_8a_32.so and /dev/null differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_64-l.so b/lib/mali450_ion/libGLES_mali_default_8a_64-l.so
new file mode 100644 (file)
index 0000000..35cf6b0
Binary files /dev/null and b/lib/mali450_ion/libGLES_mali_default_8a_64-l.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_64.so b/lib/mali450_ion/libGLES_mali_default_8a_64.so
deleted file mode 100644 (file)
index 0771a88..0000000
Binary files a/lib/mali450_ion/libGLES_mali_default_8a_64.so and /dev/null differ

diff --git a/lib/t83x_ion/libGLES_mali_default_7a_32-l.so b/lib/t83x_ion/libGLES_mali_default_7a_32-l.so
new file mode 120000 (symlink)
index 0000000..54f3789
--- /dev/null
+++ b/lib/t83x_ion/libGLES_mali_default_7a_32-l.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-l.so
\ No newline at end of file

diff --git a/lib/t83x_ion/libGLES_mali_default_7a_32-m.so b/lib/t83x_ion/libGLES_mali_default_7a_32-m.so
new file mode 120000 (symlink)
index 0000000..280a247
--- /dev/null
+++ b/lib/t83x_ion/libGLES_mali_default_7a_32-m.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-m.so
\ No newline at end of file

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_32-l.so b/lib/t83x_ion/libGLES_mali_default_8a_32-l.so
new file mode 100644 (file)
index 0000000..2f92f8f
Binary files /dev/null and b/lib/t83x_ion/libGLES_mali_default_8a_32-l.so differ

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_32-m.so b/lib/t83x_ion/libGLES_mali_default_8a_32-m.so
new file mode 120000 (symlink)
index 0000000..54f3789
--- /dev/null
+++ b/lib/t83x_ion/libGLES_mali_default_8a_32-m.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-l.so
\ No newline at end of file

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_32.so b/lib/t83x_ion/libGLES_mali_default_8a_32.so
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_64-l.so b/lib/t83x_ion/libGLES_mali_default_8a_64-l.so
new file mode 100644 (file)
index 0000000..67e539f
Binary files /dev/null and b/lib/t83x_ion/libGLES_mali_default_8a_64-l.so differ

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_64-m.so b/lib/t83x_ion/libGLES_mali_default_8a_64-m.so
new file mode 120000 (symlink)
index 0000000..8de2766
--- /dev/null
+++ b/lib/t83x_ion/libGLES_mali_default_8a_64-m.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_64-l.so
\ No newline at end of file

diff --git a/lib/t83x_ion/libGLES_mali_default_8a_64.so b/lib/t83x_ion/libGLES_mali_default_8a_64.so
old mode 100755 (executable)
new mode 100644 (file)