Merge "Move libvariablespeed to libc++."
diff --git a/variablespeed/jni/Android.mk b/variablespeed/jni/Android.mk
index ef6ff78..98b9325 100644
--- a/variablespeed/jni/Android.mk
+++ b/variablespeed/jni/Android.mk
@@ -17,8 +17,6 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
# TODO: Remove the .cc extension, just .cpp.
-# TODO: Change module name to use underscores not hyphens.
-# TODO: Work out if the log and android libs are needed.
# Add in extra warnings.
LOCAL_CFLAGS += -Wall
@@ -40,9 +38,7 @@
LOCAL_SHARED_LIBRARIES := \
libOpenSLES \
- libutils \
- libcutils \
liblog \
-include external/stlport/libstlport.mk
+LOCAL_CLANG := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/variablespeed/jni/ring_buffer.cc b/variablespeed/jni/ring_buffer.cc
index fb014d3..61c1490 100644
--- a/variablespeed/jni/ring_buffer.cc
+++ b/variablespeed/jni/ring_buffer.cc
@@ -16,6 +16,8 @@
#include "ring_buffer.h"
+#include <algorithm>
+
#include "integral_types.h"
namespace video_editing {
@@ -68,7 +70,7 @@
}
int64 RingBuffer::GetTail() const {
- return *min_element(readers_.begin(), readers_.end());
+ return *std::min_element(readers_.begin(), readers_.end());
}
int64 RingBuffer::Tell(int reader) const {
