From 2f385d2ab8a19001bbd244d0f061216e8b4cd5f7 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Wed, 20 Nov 2019 12:10:08 +0100 Subject: [PATCH] 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 Commit-Queue: Yves Gerey Cr-Commit-Position: refs/heads/master@{#29842} --- DEPS | 216 ++++++++++++++++++++++--- tools_webrtc/libs/generate_licenses.py | 10 +- webrtc.gni | 33 +--- 3 files changed, 209 insertions(+), 50 deletions(-) diff --git a/DEPS b/DEPS index b403d44fcc..a739de06d9 100644 --- a/DEPS +++ b/DEPS @@ -5,16 +5,16 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'c2481863282a401926e0ee479334c68ec362d302', + 'chromium_revision': '8b5b046f02de03f25b70064b8707e7f99b6d2c65', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@c2926851da547ceda14235cfd6dc8a72dbabaa7f', + 'https://chromium.googlesource.com/chromium/src/base@20e7dd7480bdb70ab431c9b65cbebf28067a3a98', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@da9baf4669eb13e5432220ff5030af3cfacfd33d', + 'https://chromium.googlesource.com/chromium/src/build@ed0d663913d106c809f5e45b226078cdb6fd595e', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@140e4d7c45ffb55ce5dc4d11a0c3938363cd8257', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -29,7 +29,7 @@ deps = { 'src/testing': 'https://chromium.googlesource.com/chromium/src/testing@d4d918486ad489c5aac754bfec07cc0d9dcd7dd6', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@d358c8811fc2f6b19a29c0fc76b0e23a41ee0d77', + 'https://chromium.googlesource.com/chromium/src/third_party@aad8135d1e634c08c1a9134f979e6aa8209dabf7', 'src/buildtools/linux64': { 'packages': [ @@ -104,10 +104,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/auto/src': { - 'url': 'https://chromium.googlesource.com/external/github.com/google/auto.git@8a81a858ae7b78a1aef71ac3905fade0bbd64e82', - 'condition': 'checkout_android', - }, 'src/third_party/boringssl/src': 'https://boringssl.googlesource.com/boringssl.git@d709b0d8926707f3143d8cf7c84350e49e56ec38', 'src/third_party/catapult': @@ -120,10 +116,6 @@ deps = { 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@9577daf6673d4af851bbd87a2b714f7e03cdb670', - 'src/third_party/errorprone/lib': { - 'url': 'https://chromium.googlesource.com/chromium/third_party/errorprone.git@980d49e839aa4984015efed34b0134d4b2c9b6d7', - 'condition': 'checkout_android', - }, 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@fa04e15e1ad61052e85f42413d4b841d2a496ec0', 'src/third_party/findbugs': { @@ -245,7 +237,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@ca0982ef67a3143b61d567b94a228c877999a402', + 'https://chromium.googlesource.com/chromium/src/tools@224c37eeae1c2219888c6e1ec0478bc120e392b0', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@885b3febcc170a60f25795304e60927b77d1e92d', @@ -1605,6 +1597,28 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_github_kevinstern_software_and_algorithms', + 'version': 'version:1.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_github_stephenc_jcip_jcip_annotations', + 'version': 'version:1.0-1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': { 'packages': [ { @@ -1836,11 +1850,55 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_auto_auto_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common', + 'version': 'version:0.10-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_auto_service_auto_service': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service', + 'version': 'version:1.0-rc6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_auto_service_auto_service_annotations', + 'version': 'version:1.0-rc6-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_code_findbugs_jFormatString': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jformatstring', + 'version': 'version:3.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305', - 'version': 'version:1.3.9-cr0', + 'version': 'version:3.0.2-cr0', }, ], 'condition': 'checkout_android', @@ -1891,11 +1949,66 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation', + 'version': 'version:2.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations', - 'version': 'version:2.1.3-cr0', + 'version': 'version:2.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api', + 'version': 'version:2.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core', + 'version': 'version:2.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations', + 'version': 'version:2.3.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/com_google_errorprone_javac': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac', + 'version': 'version:9+181-r4173-1-cr0', }, ], 'condition': 'checkout_android', @@ -1924,11 +2037,22 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_guava_failureaccess': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_guava_failureaccess', + 'version': 'version:1.0.1-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_guava_guava': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava', - 'version': 'version:25.0-jre-cr0', + 'version': 'version:27.0.1-jre-cr0', }, ], 'condition': 'checkout_android', @@ -1968,6 +2092,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_googlecode_java_diff_utils_diffutils', + 'version': 'version:1.3.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_squareup_javapoet': { 'packages': [ { @@ -2023,17 +2158,60 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'src/third_party/android_deps/libs/org_checkerframework_checker_qual': { 'packages': [ { - 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', - 'version': 'version:1.14-cr0', + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_qual', + 'version': 'version:2.5.2-cr0', }, ], 'condition': 'checkout_android', 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/org_checkerframework_dataflow': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow', + 'version': 'version:2.5.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_checkerframework_javacutil': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_javacutil', + 'version': 'version:2.5.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations', + 'version': 'version:1.17-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/org_pcollections_pcollections': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/org_pcollections_pcollections', + 'version': 'version:2.1.2-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, # === ANDROID_DEPS Generated Code End === } diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py index 39ba948cb8..2202188339 100755 --- a/tools_webrtc/libs/generate_licenses.py +++ b/tools_webrtc/libs/generate_licenses.py @@ -36,10 +36,12 @@ LIB_TO_LICENSES_DICT = { 'abseil-cpp': ['third_party/abseil-cpp/LICENSE'], 'android_ndk': ['third_party/android_ndk/NOTICE'], 'android_sdk': ['third_party/android_sdk/LICENSE'], - 'auto': ['third_party/auto/src/LICENSE.txt'], + 'auto': ['third_party/android_deps/libs/' + 'com_google_auto_service_auto_service/LICENSE'], 'bazel': ['third_party/bazel/LICENSE'], 'boringssl': ['third_party/boringssl/src/LICENSE'], - 'errorprone': ['third_party/errorprone/LICENSE'], + 'errorprone': ['third_party/android_deps/libs/' + 'com_google_errorprone_error_prone_core/LICENSE'], 'fiat': ['third_party/boringssl/src/third_party/fiat/LICENSE'], 'guava': ['third_party/guava/LICENSE'], 'ijar': ['third_party/ijar/LICENSE'], @@ -67,6 +69,10 @@ LIB_TO_LICENSES_DICT = { 'fft4g': ['common_audio/third_party/fft4g/LICENSE'], 'spl_sqrt_floor': ['common_audio/third_party/spl_sqrt_floor/LICENSE'], + # TODO(bugs.webrtc.org/1110): Remove this hack. This is not a lib. + # For some reason it is listed as so in _GetThirdPartyLibraries. + 'android_deps': [], + # Compile time dependencies, no license needed: 'yasm': [], 'ow2_asm': [], diff --git a/webrtc.gni b/webrtc.gni index ec0ca54940..c43233f66b 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -1005,15 +1005,6 @@ if (is_android) { 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 @@ if (is_android) { ]) # 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 @@ if (is_android) { ]) # 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 = []