summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-03 06:46:40 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-09-03 06:46:40 -0700
commit7a45be82e02515dd318da7e7a0ad869d8fae3258 (patch)
tree026e25e784578c35885ffffa9bc777b4c9c70766 /libcamera
parenta3ff3a6690e0b68605dfdc076886c2e3b78ba16e (diff)
downloaddevice_samsung_crespo-7a45be82e02515dd318da7e7a0ad869d8fae3258.zip
device_samsung_crespo-7a45be82e02515dd318da7e7a0ad869d8fae3258.tar.gz
device_samsung_crespo-7a45be82e02515dd318da7e7a0ad869d8fae3258.tar.bz2
Move crepo-conditionals to the leaves.
Two benefits: -this follows the convention that all Android.mk files are included, i.e. that reading an Android.mk file shows the entire picture. -this allows some of the leaves to become non-conditional, to increase the number of device-specific modules that are compiled in each build, which allows catching build breakages earlier. Change-Id: I060a4aecc4b5d53b9ca56f13b8599b8fa560f896
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 192af24..393ee4c 100644
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -1,3 +1,4 @@
+ifeq ($(TARGET_DEVICE),crespo)
# When zero we link against libqcamera; when 1, we dlopen libqcamera.
ifeq ($(BOARD_CAMERA_LIBRARIES),libcamera)
@@ -42,4 +43,4 @@ LOCAL_MODULE:= libcamera
include $(BUILD_SHARED_LIBRARY)
endif
-
+endif