diff options
| author | jdduke <jdduke@chromium.org> | 2015-02-06 11:33:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-06 19:33:41 +0000 |
| commit | 8681920fa22ded465054301ce96657a4ddaf2a04 (patch) | |
| tree | 089cf4c19a2dcf4cbaf10f3e13dd5d55504e7b1c /base/android | |
| parent | 4d7bcd649f45b21838e41a9174568c6db6373786 (diff) | |
| download | chromium_src-8681920fa22ded465054301ce96657a4ddaf2a04.zip chromium_src-8681920fa22ded465054301ce96657a4ddaf2a04.tar.gz chromium_src-8681920fa22ded465054301ce96657a4ddaf2a04.tar.bz2 | |
Enable libc++ on Android
Switch Chrome on Android to use libc++ instead of stlport. WebView AOSP
builds will continue to use stlport for the time being.
Note that this change is exploratory, and likely to be reverted before
branch point (ensuring WebView and Chrome remain in lockstep with
respect to standard library dependencies).
BUG=427718
TBR=cpu@chromium.org
Review URL: https://codereview.chromium.org/835633003
Cr-Commit-Position: refs/heads/master@{#315085}
Diffstat (limited to 'base/android')
| -rw-r--r-- | base/android/jni_array.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc index a157354..4bebec7 100644 --- a/base/android/jni_array.cc +++ b/base/android/jni_array.cc @@ -7,6 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/logging.h" +#include "base/stl_util.h" namespace base { namespace android { @@ -53,7 +54,7 @@ ScopedJavaLocalRef<jintArray> ToJavaIntArray( ScopedJavaLocalRef<jintArray> ToJavaIntArray( JNIEnv* env, const std::vector<int>& ints) { - return ToJavaIntArray(env, ints.begin(), ints.size()); + return ToJavaIntArray(env, vector_as_array(&ints), ints.size()); } ScopedJavaLocalRef<jlongArray> ToJavaLongArray( @@ -72,7 +73,7 @@ ScopedJavaLocalRef<jlongArray> ToJavaLongArray( // Returns a new Java long array converted from the given int64 array. BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray( JNIEnv* env, const std::vector<int64>& longs) { - return ToJavaLongArray(env, longs.begin(), longs.size()); + return ToJavaLongArray(env, vector_as_array(&longs), longs.size()); } ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray( |