Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc345f5 authored Nov 17, 2014 by Elliott Hughes Committed by Gerrit Code Review Nov 17, 2014

Merge "libcutils no longer requires that its users configure ANDROID_SMP."

parents 9b77083e 1f2f4f26

media/libmedia/Android.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -89,8 +89,6 @@ include $(BUILD_SHARED_LIBRARY)

	include $(CLEAR_VARS)		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_SRC_FILES += SingleStateQueue.cpp
	LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'		LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'

services/audioflinger/Android.mk

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -68,13 +68,6 @@ LOCAL_SRC_FILES += FastCapture.cpp FastCaptureState.cpp

	LOCAL_CFLAGS += -DSTATE_QUEUE_INSTANTIATIONS='"StateQueueInstantiations.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		LOCAL_CFLAGS += -fvisibility=hidden

	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)