diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-11 23:20:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-11 23:20:06 +0000 |
| commit | 14fc930d5d2ef272b39342fa083f4097464fc9ea (patch) | |
| tree | 406905549f4415d51f8f5b00f5ff6a643371ff65 | |
| parent | 0d64fcb46f594a89484cd112bc979903eaeda4b3 (diff) | |
| parent | 368c2bb94c1f47c1e31b89a11ad7acfc35e86693 (diff) | |
| download | frameworks_av-14fc930d5d2ef272b39342fa083f4097464fc9ea.zip frameworks_av-14fc930d5d2ef272b39342fa083f4097464fc9ea.tar.gz frameworks_av-14fc930d5d2ef272b39342fa083f4097464fc9ea.tar.bz2 | |
Merge "Clean up redundant links to stlport."
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/chromium_http/Android.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 3619821..e3fd420 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -108,7 +108,6 @@ LOCAL_SRC_FILES += \ chromium_http_stub.cpp LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 -LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk LOCAL_SHARED_LIBRARIES += \ diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index 109e3fe..1a40275 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -19,7 +19,6 @@ LOCAL_CFLAGS += -Wno-multichar LOCAL_SHARED_LIBRARIES += \ libbinder \ - libstlport \ libchromium_net \ libutils \ libbinder \ |