zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision f9be7d3d66..d298cced6c (610432:610627)

Browse Source 
Also fix Android build by switching to the new `errorprone_args` parameter introduced in https://chromium-review.googlesource.com/1349672

Change log: f9be7d3d66..d298cced6c
Full diff: f9be7d3d66..d298cced6c

Changed dependencies
* src/base: c501123f4c..637e844c7c
* src/build: a608842209..d6391e35ea
* src/ios: 7ec4d4bb81..37ce0c91d6
* src/testing: 64a90737d6..e78a57eb5b
* src/third_party: 9e781ebbaf..6c250624d7
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4176781039..43e8ebcaf2
* src/tools: 3c063fd823..6b41cb2c41
DEPS diff: f9be7d3d66..d298cced6c/DEPS

No update to Clang.

Bug: chromium:906803
Change-Id: I45b0cf87d9aefdb4b43a6335deb389ad3e8ab9d4
Reviewed-on: https://webrtc-review.googlesource.com/c/111926
Reviewed-by: Oleksandr Iakovenko <iakovenko@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25776}
This commit is contained in:
Oleh Prypin
2018-11-23 17:29:44 +01:00
committed by Commit Bot
parent 9289edae6f
commit 05aee741f6
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc.gni
View File

@ -812,14 +812,14 @@ if (is_android) {
"visibility",
])
javac_args = []
errorprone_args = []
# Treat warnings as errors.
javac_args += [ "-Werror" ]
errorprone_args += [ "-Werror" ]
# TODO(crbug.com/824679): Find out why this fails in Chromium
if (!build_with_chromium) {
javac_args += [
errorprone_args += [
"-Xep:ParameterNotNullable:ERROR",
"-Xep:FieldMissingNullable:ERROR",
"-Xep:ReturnMissingNullable:ERROR",
@ -827,8 +827,8 @@ if (is_android) {
}
# Add any arguments defined by the invoker.
if (defined(invoker.javac_args)) {
javac_args += invoker.javac_args
if (defined(invoker.errorprone_args)) {
errorprone_args += invoker.errorprone_args
}
if (!defined(deps)) {
@ -852,11 +852,11 @@ if (is_android) {
])
# Treat warnings as errors.
javac_args = [ "-Werror" ]
errorprone_args = [ "-Werror" ]
# TODO(crbug.com/824679): Find out why this fails in Chromium
if (!build_with_chromium) {
javac_args += [
errorprone_args += [
"-Xep:ParameterNotNullable:ERROR",
"-Xep:FieldMissingNullable:ERROR",
"-Xep:ReturnMissingNullable:ERROR",
@ -884,11 +884,11 @@ if (is_android) {
])
# Treat warnings as errors.
javac_args = [ "-Werror" ]
errorprone_args = [ "-Werror" ]
# TODO(crbug.com/824679): Find out why this fails in Chromium
if (!build_with_chromium) {
javac_args += [
errorprone_args += [
"-Xep:ParameterNotNullable:ERROR",
"-Xep:FieldMissingNullable:ERROR",
"-Xep:ReturnMissingNullable:ERROR",