summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-15 18:30:18 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-09-15 18:30:18 -0700
commitb7506ede04cd52038516648d2386a8b2a7ac774f (patch)
tree8b4b3d7fee6f96476ea0101dc8246a0e49e3a1a6
parent86304be09a9dca526e4e018163dc55df9096ea14 (diff)
downloaddevice_samsung_crespo-b7506ede04cd52038516648d2386a8b2a7ac774f.zip
device_samsung_crespo-b7506ede04cd52038516648d2386a8b2a7ac774f.tar.gz
device_samsung_crespo-b7506ede04cd52038516648d2386a8b2a7ac774f.tar.bz2
Fix build - make libcamera optional
Also include it in the product definition so that it still gets used when building crespo Change-Id: I0ae91726222b40a259339cba4364d03ca74d7cff
-rw-r--r--device.mk4
-rw-r--r--libcamera/Android.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/device.mk b/device.mk
index b1d93cd..1e1292c 100644
--- a/device.mk
+++ b/device.mk
@@ -70,6 +70,10 @@ PRODUCT_PACKAGES += \
lights.s5pc110 \
overlay.s5pc110
+# Camera module
+PRODUCT_PACKAGES += \
+ libcamera
+
# Input device calibration files
PRODUCT_COPY_FILES += \
device/samsung/crespo/qt602240_ts_input.idc:system/usr/idc/qt602240_ts_input.idc
diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 009fda8..17b4b33 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -43,6 +43,8 @@ endif
LOCAL_MODULE:= libcamera
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_SHARED_LIBRARY)
endif