Merge "make libserviceutility a shared lib" into lmp-mr1-dev (cfa5bf04) · Commits · e / os / android_frameworks_av

services/audioflinger/Android.mk

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,13 @@ LOCAL_SRC_FILES := \
	# FIXME Move this library to frameworks/native		# FIXME Move this library to frameworks/native
	LOCAL_MODULE := libserviceutility		LOCAL_MODULE := libserviceutility

	include $(BUILD_STATIC_LIBRARY)		LOCAL_SHARED_LIBRARIES := \
			libcutils \
			libutils \
			liblog \
			libbinder

			include $(BUILD_SHARED_LIBRARY)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)

	@@ -51,13 +57,13 @@ LOCAL_SHARED_LIBRARIES := \
	libhardware \		libhardware \
	libhardware_legacy \		libhardware_legacy \
	libeffects \		libeffects \
	libpowermanager		libpowermanager \
			libserviceutility

	LOCAL_STATIC_LIBRARIES := \		LOCAL_STATIC_LIBRARIES := \
	libscheduling_policy \		libscheduling_policy \
	libcpustats \		libcpustats \
	libmedia_helper \		libmedia_helper
	libserviceutility

	LOCAL_MODULE:= libaudioflinger		LOCAL_MODULE:= libaudioflinger
	LOCAL_32_BIT_ONLY := true		LOCAL_32_BIT_ONLY := true

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
	libbinder \		libbinder \
	libmedia \		libmedia \
	libhardware \		libhardware \
	libhardware_legacy		libhardware_legacy \
			libserviceutility

	ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)		ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
	LOCAL_SHARED_LIBRARIES += \		LOCAL_SHARED_LIBRARIES += \
	@@ -38,8 +39,7 @@ LOCAL_SHARED_LIBRARIES += \
	endif		endif

	LOCAL_STATIC_LIBRARIES := \		LOCAL_STATIC_LIBRARIES := \
	libmedia_helper \		libmedia_helper
	libserviceutility

	LOCAL_MODULE:= libaudiopolicyservice		LOCAL_MODULE:= libaudiopolicyservice

+1 −3