Merge "Don't manually link stlport."

c0daa777 · Dan Albert · Gerrit Code Review · 1c380ee5 · 83f02f24 · c0daa777
Commit c0daa777 authored 10 years ago by Dan Albert Committed by Gerrit Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

memtrack/Android.mk memtrack/Android.mk +2 -3

No files found.
--- a/memtrack/Android.mk
+++ b/memtrack/Android.mk
@@ -30,7 +30,7 @@ LOCAL_C_INCLUDES += $(includes)
 LOCAL_SHARED_LIBRARIES := \
 	liblog \

-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := stlport
 include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)
@@ -45,8 +45,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_STATIC_LIBRARIES := \
 	libc \
 	libstdc++ \
-	libstlport_static \
 	liblog \

-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := stlport_static
 include $(BUILD_EXECUTABLE)