summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorMaarten Hooft <mthooft@google.com>2011-02-28 16:33:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-28 16:33:32 -0800
commit8164eaba5b4846431997aa545f44bd158916b9e3 (patch)
tree517eb203e1141ffae2fdb66a995e71eebc1b753d /libcamera
parent5efdae1f12dd66b9a93ce27953bab8b77927e3b7 (diff)
parentd9e2146390b3169099fad416ed7589c9dfd09869 (diff)
downloaddevice_samsung_crespo-8164eaba5b4846431997aa545f44bd158916b9e3.zip
device_samsung_crespo-8164eaba5b4846431997aa545f44bd158916b9e3.tar.gz
device_samsung_crespo-8164eaba5b4846431997aa545f44bd158916b9e3.tar.bz2
am d9e21463: Add additional statements to accept the crespo4g product
* commit 'd9e2146390b3169099fad416ed7589c9dfd09869': Add additional statements to accept the crespo4g product
Diffstat (limited to 'libcamera')
-rw-r--r--libcamera/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 7e58b2b..79f4e3c 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -1,4 +1,5 @@
-ifeq ($(TARGET_DEVICE),crespo)
+ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)
+
# When zero we link against libqcamera; when 1, we dlopen libqcamera.
ifeq ($(BOARD_CAMERA_LIBRARIES),libcamera)