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

* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
  Don't manually link stlport.
This commit is contained in:
Dan Albert 2014-09-26 19:45:28 +00:00 committed by Android Git Automerger
commit be0d295da9

View file

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