diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 19:38:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 19:38:08 +0000 |
| commit | 3bc345f5719c0c20518eee69843d45653ff67d9b (patch) | |
| tree | 675e64666b0f40ddb091e9c234ce0ba069c735ee | |
| parent | 9b77083e582a8b6088ac6a2cb4151dfbdd324557 (diff) | |
| parent | 1f2f4f26073b6bf979be3a3bb66f84e3e9c4c168 (diff) | |
| download | frameworks_av-3bc345f5719c0c20518eee69843d45653ff67d9b.zip frameworks_av-3bc345f5719c0c20518eee69843d45653ff67d9b.tar.gz frameworks_av-3bc345f5719c0c20518eee69843d45653ff67d9b.tar.bz2 | |
Merge "libcutils no longer requires that its users configure ANDROID_SMP."
| -rw-r--r-- | media/libmedia/Android.mk | 2 | ||||
| -rw-r--r-- | services/audioflinger/Android.mk | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 8dddbf0..50d9a0f 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -89,8 +89,6 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -# for <cutils/atomic-inline.h> -LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0) 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) |