diff options
| author | Andreas Huber <andih@google.com> | 2011-03-11 08:47:51 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-03-11 10:07:19 -0800 |
| commit | 34fba6695fe1b55710baef561785caa0486654fb (patch) | |
| tree | 32913423c67a2a767e79a3aee84c11c467ece1b0 /media/libstagefright/Android.mk | |
| parent | 884d064fbf7f45f8089abd7d87bdca5d325cc2ab (diff) | |
| download | frameworks_av-34fba6695fe1b55710baef561785caa0486654fb.zip frameworks_av-34fba6695fe1b55710baef561785caa0486654fb.tar.gz frameworks_av-34fba6695fe1b55710baef561785caa0486654fb.tar.bz2 | |
Only use ChromiumHTTPDataSource if webkit was built with chromium support.
Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 2ed3b79..e445b74 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -77,11 +77,6 @@ LOCAL_SHARED_LIBRARIES := \ libcrypto \ libssl \ libgui \ - liblog \ - libicuuc \ - libicui18n \ - libz \ - libdl \ LOCAL_STATIC_LIBRARIES := \ libstagefright_color_conversion \ @@ -106,6 +101,46 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_id3 \ libstagefright_g711dec \ libFLAC \ + +################################################################################ + +# 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 + +# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot +# use the Chrome http stack either. +ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) + USE_ALT_HTTP := true +endif + +# 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 \ libchromium_net \ libwebcore \ @@ -115,6 +150,12 @@ LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk endif +LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 + +endif # ifeq ($(HTTP_STACK),chrome) + +################################################################################ + LOCAL_SHARED_LIBRARIES += \ libstagefright_amrnb_common \ libstagefright_enc_common \ |