diff options
| author | Maarten Hooft <mthooft@google.com> | 2011-03-01 11:13:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 11:13:08 -0800 |
| commit | 90dc253fd9478a9ed51dbdfd27dd80408e86cc03 (patch) | |
| tree | 3e2c0789d40f46009f0a1ddceadb9b231b73ae10 | |
| parent | cb301f250da295926b7b3ac64be564fb2f4f0ac0 (diff) | |
| parent | 8164eaba5b4846431997aa545f44bd158916b9e3 (diff) | |
| download | device_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
| -rw-r--r-- | libaudio/Android.mk | 2 | ||||
| -rw-r--r-- | libcamera/Android.mk | 3 | ||||
| -rwxr-xr-x | liblight/Android.mk | 2 | ||||
| -rw-r--r-- | recovery/Android.mk | 2 |
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) |