Manual chromium roll: Compile using JDK 11
This is a manual roll of [1]:
"""
Moved from manual deps into //third_party/android_deps:
* Guava-jre
* AutoService
* ErrorProne
It looks like this CL adds other libraries, but they are just those
that already existed within errorprone-ant.jar.
This updates how ErrorProne is invoked to the JDK9+ method of being a
proper javac plugin. This move necessitated moving the above libraries
into android_deps, because the version of Guava that was already in
android_deps was conflicting with our non-android_deps one.
"""
On top of that, errorprone flags have been removed,
since they aren't recognized anymore:
"error: invalid flag: -Xep:ParameterNotNullable:ERROR"
A follow-up CL will re-activate them with proper invokation.
[1] https://chromium-review.googlesource.com/c/chromium/src/+/1885951
Manual chromium roll: Compile using JDK 11.
Bug: webrtc:11102, chromium:693079
Change-Id: I6fdc700e71bcf39efae948d6195c97700c9cb978
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160011
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@google.com>
Cr-Commit-Position: refs/heads/master@{#29842}
diff --git a/webrtc.gni b/webrtc.gni
index ec0ca54..c43233f 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -1005,15 +1005,6 @@
min_sdk_version = 16
}
- # TODO(crbug.com/824679): Find out why this fails in Chromium
- if (!build_with_chromium) {
- errorprone_args += [
- "-Xep:ParameterNotNullable:ERROR",
- "-Xep:FieldMissingNullable:ERROR",
- "-Xep:ReturnMissingNullable:ERROR",
- ]
- }
-
# Add any arguments defined by the invoker.
if (defined(invoker.errorprone_args)) {
errorprone_args += invoker.errorprone_args
@@ -1039,16 +1030,8 @@
])
# Treat warnings as errors.
- errorprone_args = [ "-Werror" ]
-
- # TODO(crbug.com/824679): Find out why this fails in Chromium
- if (!build_with_chromium) {
- errorprone_args += [
- "-Xep:ParameterNotNullable:ERROR",
- "-Xep:FieldMissingNullable:ERROR",
- "-Xep:ReturnMissingNullable:ERROR",
- ]
- }
+ errorprone_args = []
+ errorprone_args += [ "-Werror" ]
if (!defined(deps)) {
deps = []
@@ -1070,16 +1053,8 @@
])
# Treat warnings as errors.
- errorprone_args = [ "-Werror" ]
-
- # TODO(crbug.com/824679): Find out why this fails in Chromium
- if (!build_with_chromium) {
- errorprone_args += [
- "-Xep:ParameterNotNullable:ERROR",
- "-Xep:FieldMissingNullable:ERROR",
- "-Xep:ReturnMissingNullable:ERROR",
- ]
- }
+ errorprone_args = []
+ errorprone_args += [ "-Werror" ]
if (!defined(deps)) {
deps = []