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 /services/audioflinger | |
| 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 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Android.mk | 7 |
1 files changed, 0 insertions, 7 deletions
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) |