commit 2f702c9bc0d07f5d48f6f50586b1e11d9ac59381
author Dan Albert <danalbert@google.com> Tue Nov 11 22:51:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 11 22:51:18 2014 +0000
tree 519ddfbf39c4eb23ebaeda790eec1c860df62197
parent 7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731
parent 43e10bb74913a9c9e739c1d4cacbed9be885ffa7

am 43e10bb7: Merge "Move to libc++."

* commit '43e10bb74913a9c9e739c1d4cacbed9be885ffa7':
  Move to libc++.

media/libmedia/Android.mk

diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 8dddbf0..8ea27b8 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -90,7 +90,17 @@
 include $(CLEAR_VARS)
 
 # for <cutils/atomic-inline.h>
-LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0)
+ifeq ($(TARGET_CPU_SMP),true)
+  LOCAL_CFLAGS += -DANDROID_SMP=1
+else
+  ifeq ($(TARGET_CPU_SMP),false)
+    LOCAL_CFLAGS += -DANDROID_SMP=0
+  else
+    $(warning TARGET_CPU_SMP should be (true|false), found $(TARGET_CPU_SMP))
+    # Make sure we emit barriers for the worst case.
+    LOCAL_CFLAGS += -DANDROID_SMP=1
+  endif
+endif
 LOCAL_SRC_FILES += SingleStateQueue.cpp
 LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'