am 917d6f4c: Merge "Move libutils to libc++."

* commit '917d6f4c73f7856adf4f369a675aeccfe42d746b':
  Move libutils to libc++.
This commit is contained in:
Dan Albert 2014-11-16 09:57:18 +00:00 committed by Android Git Automerger
commit f6f091a509

View file

@ -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