gpu: fixed o-pdk compile error on r6p1

PD#147955
Change-Id: I0088c737927b7901aba37c70e80dbe71e6c65fdf

diff --git a/gpu.mk b/gpu.mk
index 27c9e9caeca8d48d08da59a17a384ce9162d26a2..7e77165e6493d5ae3927060e0d95d2bfe0b863b3 100644 (file)
--- a/gpu.mk
+++ b/gpu.mk
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 25 && echo OK),OK)
 ifneq (,$(wildcard device/amlogic/$(TARGET_PRODUCT)/BoardConfig.mk))
 include device/amlogic/$(TARGET_PRODUCT)/BoardConfig.mk
 else
@@ -26,6 +27,7 @@ $(error "find the BoardConfig file, then include it")
 endif
 endif
 endif
+endif
 
 LOCAL_KK=0
 ifeq ($(GPU_TYPE), t82x)

diff --git a/lib/lib.mk b/lib/lib.mk
index 179635b277e3862c6ecd44646c4a87cc8d7c1980..d739d5630961dae5d079de35105cabf2051df64a 100755 (executable)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -56,9 +56,12 @@ 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       := $(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
+ifeq ($(TARGET_2ND_ARCH),)
+LOCAL_SRC_FILES         := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_32-$(LOCAL_ANDROID_VERSION_NUM).so
+else
+LOCAL_SRC_FILES_32   := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_32-$(LOCAL_ANDROID_VERSION_NUM).so
+LOCAL_SRC_FILES_64      := $(TARGET)/libGLES_mali_$(GPU_TARGET_PLATFORM)_64-$(LOCAL_ANDROID_VERSION_NUM).so
+endif
 include $(BUILD_PREBUILT)
 
 endif