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: 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}
This commit is contained in:
Henrik Kjellander
2015-05-11 11:34:32 +02:00
parent 242e22b055
commit 9f7908e497
2 changed files with 3 additions and 2 deletions

2
DEPS
View File

@ -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

View File

@ -18,6 +18,7 @@
#include <android/log.h>
#include <jni.h>
#include <assert.h>
#include <map>
#include <string>
@ -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