am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport."

* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
  Don't manually link stlport.
This commit is contained in:
Dan Albert 2014-09-26 19:53:04 +00:00 committed by Android Git Automerger
commit 31171b6e31

View file

@ -41,9 +41,9 @@ LOCAL_STATIC_LIBRARIES := \
libc \
libcutils \
liblog \
libstlport_static \
libutils \
LOCAL_CXX_STL := stlport_static
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64