summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorMaarten Hooft <mthooft@google.com>2011-03-01 11:13:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-01 11:13:08 -0800
commit90dc253fd9478a9ed51dbdfd27dd80408e86cc03 (patch)
tree3e2c0789d40f46009f0a1ddceadb9b231b73ae10 /libcamera
parentcb301f250da295926b7b3ac64be564fb2f4f0ac0 (diff)
parent8164eaba5b4846431997aa545f44bd158916b9e3 (diff)
downloaddevice_samsung_crespo-90dc253fd9478a9ed51dbdfd27dd80408e86cc03.zip
device_samsung_crespo-90dc253fd9478a9ed51dbdfd27dd80408e86cc03.tar.gz
device_samsung_crespo-90dc253fd9478a9ed51dbdfd27dd80408e86cc03.tar.bz2
am 8164eaba: am d9e21463: Add additional statements to accept the crespo4g product
* commit '8164eaba5b4846431997aa545f44bd158916b9e3': 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)