diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-12 22:26:10 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-12 22:26:10 +0159 |
| commit | 96027882ceb1235029685158e32585dd012d457b (patch) | |
| tree | 0fcd2a747e25b29ebe74c2cb2a3d3255cacdf2aa | |
| parent | b9372eacecb088c61409a412cae109bed5cecd01 (diff) | |
libcamera: Fix conflict with omap libcamera
Don't build the generic libcamera on OMAP, the
Makefile targets conflict with the native omap
libcamera
Change-Id: Id4d147458b9b358d96166e9d944e9aaf2f8aa48c
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | libcamera/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcamera/Android.mk b/libcamera/Android.mk index 1275cfa..b15dc61 100644 --- a/libcamera/Android.mk +++ b/libcamera/Android.mk @@ -1,3 +1,6 @@ +# omap4 has its own native camera implementation, see +# hardware/ti/omap4xxx +ifneq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ @@ -35,3 +38,4 @@ LOCAL_MODULE:= camera.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS:= optional include $(BUILD_SHARED_LIBRARY) +endif |