commit 98f12500dbcb34335392f5177048b7b0f69741ab
author Ying Wang <wangying@google.com> Fri Aug 03 17:50:54 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 03 17:50:54 2012 -0700
tree e8e67f44c07af89c402c4b24b7e98908f2d11709
parent 1ebccf52559ee7249bfe25c1a7c0232f8bc8060f
parent b81dcd5a3e9508def58a7f79a110d37ca27aebf9

am b81dcd5a: am e643ccba: Merge "Remove circular dependency." into jb-mr1-dev

* commit 'b81dcd5a3e9508def58a7f79a110d37ca27aebf9':
  Remove circular dependency.

media/libstagefright/Android.mk

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index e5b4d75..3fd0f85 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -102,10 +102,6 @@
         chromium_http_stub.cpp
 LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1
 
-ifneq ($(TARGET_BUILD_PDK), true)
-LOCAL_REQUIRED_MODULES := libstagefright_chromium_http
-endif
-
 LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
 
@@ -119,6 +115,8 @@
 
 LOCAL_MODULE:= libstagefright
 
+LOCAL_MODULE_TAGS := optional
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))