From 41a0ce0f16709f40a21e4e3e418df84a00e18dd1 Mon Sep 17 00:00:00 2001 From: Jiyu Yang Date: Tue, 20 Jun 2017 13:49:13 +0800 Subject: [PATCH] gpu: fixed o-pdk compile error on r6p1 PD#147955 Change-Id: I0088c737927b7901aba37c70e80dbe71e6c65fdf --- gpu.mk | 2 ++ lib/lib.mk | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gpu.mk b/gpu.mk index 27c9e9c..7e77165 100644 --- 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 179635b..d739d56 100755 --- 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 -- 2.20.1