diff options
author | Glenn Kasten <gkasten@google.com> | 2014-03-19 14:15:27 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2014-03-19 14:15:27 -0700 |
commit | 259ace8f6057dbb0fdec4c8223aefc0282274be3 (patch) | |
tree | dcd87bbdfa2bf0e440a6b8667d79f1dd16c2baa5 /media/libstagefright/httplive | |
parent | 91cea7023fdfde5432d5bc128b8c3a9b09dc0e72 (diff) | |
parent | c250980f65ffec76537d9c6d9b1ad12afc38346a (diff) | |
download | frameworks_av-259ace8f6057dbb0fdec4c8223aefc0282274be3.zip frameworks_av-259ace8f6057dbb0fdec4c8223aefc0282274be3.tar.gz frameworks_av-259ace8f6057dbb0fdec4c8223aefc0282274be3.tar.bz2 |
Merge commit 'c250980f' into manualmerge
Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
Diffstat (limited to 'media/libstagefright/httplive')
-rw-r--r-- | media/libstagefright/httplive/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index 9c1994a..e8d558c 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -30,6 +30,4 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -Wno-psabi endif -LOCAL_32_BIT_ONLY := true - include $(BUILD_SHARED_LIBRARY) |