diff --git a/DEPS b/DEPS index 1e56c874cc..48ad9c114b 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'ec5b7687d06564998e7f1b96465878a391edc723', + 'chromium_revision': '62a5bb3d60f9863666194da9446d467c69fe3280', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/examples/android/media_demo/jni/jni_helpers.h b/webrtc/examples/android/media_demo/jni/jni_helpers.h index ea1a7a6549..c3f2b5d628 100644 --- a/webrtc/examples/android/media_demo/jni/jni_helpers.h +++ b/webrtc/examples/android/media_demo/jni/jni_helpers.h @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -29,7 +30,7 @@ } else { \ __android_log_print(ANDROID_LOG_ERROR, TAG, "%s:%d: %s", __FILE__, \ __LINE__, msg); \ - abort(); \ + assert(false); \ } // Abort the process if |jni| has a Java exception pending, emitting |msg| to