summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Hooft <mthooft@google.com>2011-02-28 16:26:18 -0800
committerMaarten Hooft <mthooft@google.com>2011-02-28 16:26:18 -0800
commitd9e2146390b3169099fad416ed7589c9dfd09869 (patch)
tree8022b3b76a7b920d0bb5ab15055dbd43d4ef3ce0
parentfcba3707358783f0b311c750a3d5637f0517066f (diff)
downloaddevice_samsung_crespo-d9e2146390b3169099fad416ed7589c9dfd09869.zip
device_samsung_crespo-d9e2146390b3169099fad416ed7589c9dfd09869.tar.gz
device_samsung_crespo-d9e2146390b3169099fad416ed7589c9dfd09869.tar.bz2
Add additional statements to accept the crespo4g product
Change-Id: I0e410d7b641c19a773c3bc57cb78e8aa3e27a3ff
-rw-r--r--libaudio/Android.mk2
-rw-r--r--libcamera/Android.mk3
-rwxr-xr-xliblight/Android.mk2
-rw-r--r--recovery/Android.mk2
4 files changed, 5 insertions, 4 deletions
diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index 5ff0a21..726859b 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
-ifeq ($(TARGET_DEVICE),crespo)
+ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= aplay.c alsa_pcm.c alsa_mixer.c
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)
diff --git a/liblight/Android.mk b/liblight/Android.mk
index b594be3..d10b586 100755
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifeq ($(TARGET_DEVICE),crespo)
+ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)
# HAL module implemenation, not prelinked and stored in
diff --git a/recovery/Android.mk b/recovery/Android.mk
index 1427d84..2100f3d 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_DEVICE),crespo)
+ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)