gaoyang3513/SDK_RK3288
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hardware/rockchip/camera] camerahal: fix config/Android.mk bug of last commit

Browse Source
This commit is contained in:
Firefly
2015-11-03 15:44:40 +08:00
committed by cjp
parent 6d7dca838f
commit ca3537dc7b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hardware/rockchip/camera/Config/Android.mk
View File

@ -1,10 +1,14 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libisp_silicomimageisp_api
ifeq (1,$(strip $(shell expr $(PLATFORM_VERSION) \>= 6.0)))
LOCAL_MODULE := libisp_silicomimageisp_api_6x
LOCAL_SRC_FILES_arm := $(LOCAL_MODULE)_6x_32bit.so
LOCAL_SRC_FILES_arm64 := $(LOCAL_MODULE)_64bit.so
else
LOCAL_MODULE := libisp_silicomimageisp_api_5x
LOCAL_SRC_FILES_arm := $(LOCAL_MODULE)_5x_32bit.so
LOCAL_SRC_FILES_arm64 := $(LOCAL_MODULE)_64bit.so
endif
ifeq ($(strip $(TARGET_BOARD_PLATFORM)), rk3368)
@ -21,8 +25,8 @@ endif
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_SRC_FILES_arm := $(LOCAL_MODULE)_32bit.so
LOCAL_SRC_FILES_arm64 := $(LOCAL_MODULE)_64bit.so
#LOCAL_SRC_FILES_arm := $(LOCAL_MODULE)_32bit.so
#LOCAL_SRC_FILES_arm64 := $(LOCAL_MODULE)_64bit.so
LOCAL_MODULE_SUFFIX := .so
include $(BUILD_PREBUILT)
endif
@ -33,7 +37,7 @@ ifeq ($(strip $(TARGET_BOARD_PLATFORM)),rk3288)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
#LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
LOCAL_MODULE_SUFFIX := .so
include $(BUILD_PREBUILT)
endif
@ -44,7 +48,7 @@ ifeq ($(strip $(TARGET_BOARD_PLATFORM)),rk312x)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
#LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
LOCAL_MODULE_SUFFIX := .so
include $(BUILD_PREBUILT)
endif
@ -55,7 +59,7 @@ ifeq ($(strip $(TARGET_BOARD_PLATFORM)),rk3036)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
#LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
LOCAL_MODULE_SUFFIX := .so
include $(BUILD_PREBUILT)
endif
@ -66,7 +70,7 @@ ifeq ($(strip $(TARGET_BOARD_PLATFORM)),rk3188)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_STEM := $(LOCAL_MODULE)
LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
#LOCAL_SRC_FILES := $(LOCAL_MODULE)_32bit.so
LOCAL_MODULE_SUFFIX := .so
include $(BUILD_PREBUILT)
endif