Permalink
Browse files

am 8164eab: am d9e2146: Add additional statements to accept the cresp…

…o4g product

* commit '8164eaba5b4846431997aa545f44bd158916b9e3':
  Add additional statements to accept the crespo4g product
  • Loading branch information...
2 parents cb301f2 + 8164eab commit 90dc253fd9478a9ed51dbdfd27dd80408e86cc03 Maarten Hooft committed with Android Git Automerger Mar 1, 2011
Showing with 5 additions and 4 deletions.
  1. +1 −1 libaudio/Android.mk
  2. +2 −1 libcamera/Android.mk
  3. +1 −1 liblight/Android.mk
  4. +1 −1 recovery/Android.mk
View
@@ -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
View
@@ -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)
View
@@ -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
View
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_DEVICE),crespo)
+ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

0 comments on commit 90dc253

Please sign in to comment.