From d87b2d6567746a5e26ae5eba03830db8c297d0d4 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Sat, 15 Nov 2014 17:57:24 -0800
Subject: Move libvariablespeed to libc++.

Bug: 15193147
Change-Id: Ie582a5789fea7fa83442d998b0d27388176e4e77
---
 variablespeed/jni/Android.mk     | 6 +-----
 variablespeed/jni/ring_buffer.cc | 4 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

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 @@ include $(CLEAR_VARS)
 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_C_INCLUDES := \
 
 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 @@ int RingBuffer::overhead() const {
 }
 
 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 {
-- 
cgit v1.2.3