From 1784ceccd6dd69a532153b8b67e90b9c4aaa81d4 Mon Sep 17 00:00:00 2001
From: Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de>
Date: Sun, 22 Jul 2012 17:32:42 +0200
Subject: fix libcamera and fimc conflict

---
 exynos4/hal/Android.mk | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'exynos4')

diff --git a/exynos4/hal/Android.mk b/exynos4/hal/Android.mk
index 5765418..6b9a7ce 100644
--- a/exynos4/hal/Android.mk
+++ b/exynos4/hal/Android.mk
@@ -15,10 +15,18 @@
 #
 
 ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
-#common_exynos4_dirs := libgralloc_ump libhdmi libfimc libhwcomposer libcamera libhwconverter
-common_exynos4_dirs := libgralloc_ump libhdmi libfimc libhwcomposer libhwconverter
-exynos4210_dirs := $(common_exynos4_dirs) libs5pjpeg libfimg3x
 
+common_exynos4_dirs := libgralloc_ump libhdmi libhwcomposer libhwconverter
+
+ifneq ($(BOARD_USES_PROPRIETARY_LIBCAMERA),true)
+common_exynos4_dirs += libcamera
+endif
+
+ifneq ($(BOARD_USES_PROPRIETARY_LIBFIMC),true)
+common_exynos4_dirs += libfimc
+endif
+
+exynos4210_dirs := $(common_exynos4_dirs) libs5pjpeg libfimg3x
 exynos4x12_dirs := $(common_exynos4_dirs) libhwjpeg libfimg4x
 
 ifeq ($(TARGET_SOC),exynos4210)
-- 
cgit v1.1