update different prebuilt so for different gralloc[1/1]

PD#161903
Change-Id: Ia68ecd73c9f270b4904540bef9096fea9af51374

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

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

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

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_32-n-r10p0gralloc1.so b/lib/dvalin_ion/libGLES_mali_default_8a_32-n-r10p0gralloc1.so
new file mode 100644 (file)
index 0000000..d1176f3
Binary files /dev/null and b/lib/dvalin_ion/libGLES_mali_default_8a_32-n-r10p0gralloc1.so differ

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0.so b/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0.so
deleted file mode 100755 (executable)
index c90549b..0000000
Binary files a/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0.so and /dev/null differ

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0gralloc1.so b/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0gralloc1.so
new file mode 100644 (file)
index 0000000..c90549b
Binary files /dev/null and b/lib/dvalin_ion/libGLES_mali_default_8a_32-o-r10p0gralloc1.so differ

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_64-n-r10p0gralloc1.so b/lib/dvalin_ion/libGLES_mali_default_8a_64-n-r10p0gralloc1.so
new file mode 100644 (file)
index 0000000..6c7d81c
Binary files /dev/null and b/lib/dvalin_ion/libGLES_mali_default_8a_64-n-r10p0gralloc1.so differ

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0.so b/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0.so
deleted file mode 100755 (executable)
index 8aae6e1..0000000
Binary files a/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0.so and /dev/null differ

diff --git a/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0gralloc1.so b/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0gralloc1.so
new file mode 100644 (file)
index 0000000..8aae6e1
Binary files /dev/null and b/lib/dvalin_ion/libGLES_mali_default_8a_64-o-r10p0gralloc1.so differ

diff --git a/lib/lib.mk b/lib/lib.mk
index 136ca45ed70f88a4b5a8f66769451dce07359219..3fe1d448a4876f2886f29a3b427928d93b1e0873 100755 (executable)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -14,6 +14,9 @@ endif
 ifneq (,$(wildcard vendor/arm/t83x))
 MALI_LIB_PREBUILT=false
 endif
+ifneq (,$(wildcard vendor/amlogic/meson_mali))
+MALI_LIB_PREBUILT=false
+endif
 #already in hardware/arm/gpu/lib
 
 ifeq ($(MALI_LIB_PREBUILT),true)
@@ -52,6 +55,12 @@ endif
 endif
 endif
 endif
+
+ifeq ($(GRALLOC_USE_GRALLOC1_API),1)
+LOCAL_ANDROID_VERSION_NUM:=${LOCAL_ANDROID_VERSION_NUM}gralloc1
+endif
+
+#$(info source is $(LOCAL_ANDROID_VERSION_NUM))
 LOCAL_MODULE := libGLES_mali
 LOCAL_MULTILIB := both
 LOCAL_MODULE_SUFFIX := .so

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

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0.so b/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0.so
index 24b7857f56781f10c94bc9d3f1b9f7c4e6a78a8f..093273af8be135e8b255dc2572b79febbc576de0 100644 (file)
Binary files a/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0.so and b/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0gralloc1.so b/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0gralloc1.so
new file mode 100644 (file)
index 0000000..94915cc
Binary files /dev/null and b/lib/mali450_ion/libGLES_mali_default_8a_32-o-r8p0gralloc1.so differ

diff --git a/lib/mali450_ion/libGLES_mali_default_8a_64-o-r8p0.so b/lib/mali450_ion/libGLES_mali_default_8a_64-o-r8p0.so
index 56a579b0f18ef861ca82b4d2259ee1bb5baf98a1..d94cdd85a280b4bd640230ca6bdf7b87b5ff6fb1 100644 (file)
Binary files a/lib/mali450_ion/libGLES_mali_default_8a_64-o-r8p0.so and b/lib/mali450_ion/libGLES_mali_default_8a_64-o-r8p0.so differ

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

diff --git a/lib/t82x_ion/libGLES_mali_default_7a_32-o-r21p0.so b/lib/t82x_ion/libGLES_mali_default_7a_32-o-r21p0.so
new file mode 120000 (symlink)
index 0000000..47a6f39
--- /dev/null
+++ b/lib/t82x_ion/libGLES_mali_default_7a_32-o-r21p0.so
@@ -0,0 +1 @@
+libGLES_mali_default_8a_32-o-r21p0.so
\ No newline at end of file

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