diff options
author | Colin Cross <ccross@android.com> | 2012-06-15 13:56:18 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-06-15 17:08:48 -0700 |
commit | bea455c8e4a230cc5aedc9df33e1ba97c64cec5f (patch) | |
tree | df728643d29e66431b4d768887c55ce5bbf09e93 /media/libstagefright/Android.mk | |
parent | fea3699c6921f50f404b6285d588894cee63d85f (diff) | |
download | frameworks_av-bea455c8e4a230cc5aedc9df33e1ba97c64cec5f.zip frameworks_av-bea455c8e4a230cc5aedc9df33e1ba97c64cec5f.tar.gz frameworks_av-bea455c8e4a230cc5aedc9df33e1ba97c64cec5f.tar.bz2 |
libstagefright: dynamically load libstagefright_chromium_http
dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.
Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
Diffstat (limited to 'media/libstagefright/Android.mk')
-rw-r--r-- | media/libstagefright/Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8ad1cb9..8a68036 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -97,12 +97,12 @@ LOCAL_STATIC_LIBRARIES := \ libstagefright_id3 \ libFLAC \ -ifneq ($(TARGET_BUILD_PDK), true) -LOCAL_STATIC_LIBRARIES += \ - libstagefright_chromium_http -LOCAL_SHARED_LIBRARIES += \ - libchromium_net +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 |