summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-05-23 00:04:28 +0200
committerBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2013-05-23 00:04:28 +0200
commitf3eccf040eae282cd0250c02f92843aad03f1c30 (patch)
treeedb0e228a13f01745094999c0c8d7a305707a3c2
parent2df2cf65a83d22c003c9b35d68a8e5ee96487a96 (diff)
downloadcommon-linaro_android_jb.tar.gz
libcamera: Don't build on msm8960 (Nexus 4) eitherlinaro_android_jb
Change-Id: I03cdb0a9750f4f7bce9b0d126b9620cab681a965 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--libcamera/Android.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index f73bc7f..79a9e9c 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -1,8 +1,9 @@
-# Exynos and omap4 have their own native camera implementations, see
-# hardware/ti/omap4xxx
+# Exynos, omap4 and msm8960 have their own native camera
+# implementations, see
# hardware/samsung_slsi/exynos5/libcamera2
-ifneq ($(TARGET_BOARD_PLATFORM),omap4)
-ifneq ($(TARGET_BOARD_PLATFORM),exynos5)
+# hardware/ti/omap4xxx
+# hardware/qcom/camera/QCamera/HAL2/core
+ifeq ($(findstring $(TARGET_BOARD_PLATFORM),omap4 exynos5 msm8960),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -41,4 +42,3 @@ LOCAL_MODULE_TAGS:= optional
include $(BUILD_SHARED_LIBRARY)
endif
-endif