diff options
author | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-22 17:32:42 +0200 |
---|---|---|
committer | Daniel Hillenbrand <daniel.hillenbrand@codeworkx.de> | 2012-07-22 17:32:42 +0200 |
commit | 1784ceccd6dd69a532153b8b67e90b9c4aaa81d4 (patch) | |
tree | 9579e5be2eec75ba1c7f0110543a24a34bb612bf | |
parent | 353fecb128199378439a3e8da8200f654551a526 (diff) | |
download | android_hardware_samsung-1784ceccd6dd69a532153b8b67e90b9c4aaa81d4.tar.gz android_hardware_samsung-1784ceccd6dd69a532153b8b67e90b9c4aaa81d4.tar.bz2 android_hardware_samsung-1784ceccd6dd69a532153b8b67e90b9c4aaa81d4.zip |
fix libcamera and fimc conflict
-rw-r--r-- | exynos4/hal/Android.mk | 14 |
1 files changed, 11 insertions, 3 deletions
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) |