diff options
| author | Steve Block <steveblock@google.com> | 2012-02-23 04:29:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-23 04:29:30 -0800 |
| commit | 7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4 (patch) | |
| tree | 272ac90d4df3ebe73d0763a6782adf7a4917f185 /media/libstagefright/Android.mk | |
| parent | 79af02c6a813b5d31fba3e7b72686a02f0ae7e0f (diff) | |
| parent | 43b1d8ad30bcd61c8cc62fce52fdc6d8381e5732 (diff) | |
| download | frameworks_av-7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4.zip frameworks_av-7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4.tar.gz frameworks_av-7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4.tar.bz2 | |
Merge "Drop support for Android HTTP stack"
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 71 |
1 files changed, 20 insertions, 51 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 829f657..cfb1e29 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -63,20 +63,26 @@ LOCAL_C_INCLUDES:= \ $(TOP)/external/openssl/include \ LOCAL_SHARED_LIBRARIES := \ - libbinder \ - libmedia \ - libutils \ - libcutils \ - libui \ - libsonivox \ - libvorbisidec \ + libbinder \ + libmedia \ + libutils \ + libcutils \ + libui \ + libsonivox \ + libvorbisidec \ libstagefright_yuv \ libcamera_client \ - libdrmframework \ - libcrypto \ - libssl \ - libgui \ + libdrmframework \ + libcrypto \ + 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 \ |