Merge "Move libutils to libc++."

917d6f4c · Dan Albert · Gerrit Code Review · 133b7d4a · 890442a0 · 917d6f4c
Commit 917d6f4c authored Nov 16, 2014 by Dan Albert Committed by Gerrit Code Review Nov 16, 2014
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -104,8 +104,6 @@ LOCAL_SHARED_LIBRARIES := \
        liblog \
        libdl

-include external/stlport/libstlport.mk
-
 LOCAL_MODULE:= libutils
 include $(BUILD_STATIC_LIBRARY)

@@ -121,8 +119,6 @@ LOCAL_SHARED_LIBRARIES := \
        liblog
 LOCAL_CFLAGS := -Werror

-include external/stlport/libstlport.mk
-
 include $(BUILD_SHARED_LIBRARY)

 # Include subdirectory makefiles