diff options
| author | Ying Wang <wangying@google.com> | 2012-08-03 17:42:01 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-03 17:43:41 -0700 |
| commit | 8d5ec2a336c114688e5d2950b124440e07e79ad9 (patch) | |
| tree | 12bce370a9f92dca263a27fc32e768c4ab9774a5 /media/libstagefright/Android.mk | |
| parent | 428b77a2b94b74665a47375b3fdb893b98d71269 (diff) | |
| download | frameworks_av-8d5ec2a336c114688e5d2950b124440e07e79ad9.zip frameworks_av-8d5ec2a336c114688e5d2950b124440e07e79ad9.tar.gz frameworks_av-8d5ec2a336c114688e5d2950b124440e07e79ad9.tar.bz2 | |
Remove circular dependency.
libstagefright_chromium_http is added to build/target/product/core.mk
instead.
Bug: 6933259
Change-Id: I2e87037eea0f1f2a56936dd02419cde564c8670d
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
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 @@ LOCAL_SRC_FILES += \ 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_CFLAGS += -Wno-multichar LOCAL_MODULE:= libstagefright +LOCAL_MODULE_TAGS := optional + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) |