diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:22:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-16 17:22:42 +0000 |
| commit | 842e82f6b8d85c71469f4decdfd5d1a486d55881 (patch) | |
| tree | cdaef2eaaed5b77434eda422ed4de0711dac3c76 | |
| parent | 21e5d2401d605b31bccd6357da4ee7c49cf08aed (diff) | |
| parent | d87b2d6567746a5e26ae5eba03830db8c297d0d4 (diff) | |
| download | android_frameworks_ex-842e82f6b8d85c71469f4decdfd5d1a486d55881.tar.gz android_frameworks_ex-842e82f6b8d85c71469f4decdfd5d1a486d55881.tar.bz2 android_frameworks_ex-842e82f6b8d85c71469f4decdfd5d1a486d55881.zip | |
Merge "Move libvariablespeed to libc++."
| -rw-r--r-- | variablespeed/jni/Android.mk | 6 | ||||
| -rw-r--r-- | 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 { |