diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 20:27:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:27:27 +0000 |
| commit | 98d78d1579d3702d7a94dd7d582d1cd99e35f22e (patch) | |
| tree | 74d4515e504e7f6fac817cba9d7c8b7fd45aa172 | |
| parent | 81d505fa9d2e6a8d984738d50a88801199b453b4 (diff) | |
| parent | f1b0c671e85d7ad5e1aa94d16336cda57158cd33 (diff) | |
| download | frameworks_av-98d78d1579d3702d7a94dd7d582d1cd99e35f22e.zip frameworks_av-98d78d1579d3702d7a94dd7d582d1cd99e35f22e.tar.gz frameworks_av-98d78d1579d3702d7a94dd7d582d1cd99e35f22e.tar.bz2 | |
am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master
* commit 'f1b0c671e85d7ad5e1aa94d16336cda57158cd33':
libcutils no longer requires that its users configure ANDROID_SMP.
| -rw-r--r-- | media/libmedia/Android.mk | 12 | ||||
| -rw-r--r-- | services/audioflinger/Android.mk | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 8ea27b8..50d9a0f 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -89,18 +89,6 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -# for <cutils/atomic-inline.h> -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"' diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 697fb37..83211eb 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -68,13 +68,6 @@ LOCAL_SRC_FILES += FastCapture.cpp FastCaptureState.cpp LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.cpp"' -# Define ANDROID_SMP appropriately. Used to get inline tracing fast-path. -ifeq ($(TARGET_CPU_SMP),true) - LOCAL_CFLAGS += -DANDROID_SMP=1 -else - LOCAL_CFLAGS += -DANDROID_SMP=0 -endif - LOCAL_CFLAGS += -fvisibility=hidden include $(BUILD_SHARED_LIBRARY) |