From 9f7908e49713065d817650faeed763b8429fe8ee Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 11 May 2015 11:34:32 +0200 Subject: [PATCH] Roll chromium_revision ec5b768..62a5bb3 (328242:329063) A minor code change had to be made due to https://codereview.chromium.org/951983002 Relevant changes: * src/buildtools: 15f5fc6..b0ede9c Details: https://chromium.googlesource.com/chromium/src/+/ec5b768..62a5bb3/DEPS Clang version was not updated in this roll. R=henrika@webrtc.org Review URL: https://webrtc-codereview.appspot.com/49949004 Cr-Commit-Position: refs/heads/master@{#9167} --- DEPS | 2 +- webrtc/examples/android/media_demo/jni/jni_helpers.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 1e56c874c..48ad9c114 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 ea1a7a654..c3f2b5d62 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