diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 19:57:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 19:57:43 +0000 |
| commit | f1b0c671e85d7ad5e1aa94d16336cda57158cd33 (patch) | |
| tree | 8ecb4783b410e7452aa286983155d6b5b3dbeb8c /media | |
| parent | bf1e36e8b7a6e08e2f20dd0b2900dda259c23459 (diff) | |
| parent | 2716969d2b88e85a6ed5a766b54a0a34dc137118 (diff) | |
| download | frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.zip frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.tar.gz frameworks_av-f1b0c671e85d7ad5e1aa94d16336cda57158cd33.tar.bz2 | |
am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master
* commit '2716969d2b88e85a6ed5a766b54a0a34dc137118':
libcutils no longer requires that its users configure ANDROID_SMP.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Android.mk | 12 |
1 files changed, 0 insertions, 12 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"' |