Merge "Drop support for Android HTTP stack" (7fd17031) · Commits · e / os / android_frameworks_av

media/libstagefright/Android.mk

+20 −51

Original line number	Diff line number	Diff line
		@@ -77,6 +77,12 @@ LOCAL_SHARED_LIBRARIES := \
		libssl \
		libgui \
		libstagefright_omx \
		liblog \
		libicuuc \
		libicui18n \
		libz \
		libdl \
		libchromium_net \

		LOCAL_STATIC_LIBRARIES := \
		libstagefright_color_conversion \
		@@ -90,51 +96,14 @@ LOCAL_STATIC_LIBRARIES := \
		libstagefright_httplive \
		libstagefright_id3 \
		libFLAC \
		libstagefright_chromium_http \

		################################################################################

		# The following was shamelessly copied from external/webkit/Android.mk and
		# currently must follow the same logic to determine how webkit was built and
		# if it's safe to link against libchromium_net

		# See if the user has specified a stack they want to use
		HTTP_STACK = $(HTTP)
		# We default to the Chrome HTTP stack.
		DEFAULT_HTTP = chrome
		ALT_HTTP = android

		ifneq ($(HTTP_STACK),chrome)
		ifneq ($(HTTP_STACK),android)
		# No HTTP stack is specified, pickup the one we want as default.
		ifeq ($(USE_ALT_HTTP),true)
		HTTP_STACK = $(ALT_HTTP)
		else
		HTTP_STACK = $(DEFAULT_HTTP)
		endif
		endif
		endif

		ifeq ($(HTTP_STACK),chrome)

		LOCAL_SHARED_LIBRARIES += \
		liblog \
		libicuuc \
		libicui18n \
		libz \
		libdl \

		LOCAL_STATIC_LIBRARIES += \
		libstagefright_chromium_http

		LOCAL_SHARED_LIBRARIES += libstlport libchromium_net
		LOCAL_SHARED_LIBRARIES += libstlport
		include external/stlport/libstlport.mk

		# TODO: Chromium is always available, so this flag can be removed.
		LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1

		endif # ifeq ($(HTTP_STACK),chrome)

		################################################################################

		LOCAL_SHARED_LIBRARIES += \
		libstagefright_enc_common \
		libstagefright_avc_common \