Roll chromium_revision 6ae0f0cd4c..bf62d746a4 (669703:669828) + fix AndroidManifest
In https://chromium-review.googlesource.com/1650265 attributes like minSdkVersion were moved from AndroidManifest.xml to GN files. For WebRTC there were a few problems with that.
* We don't want to suppress UsesMinSdkAttributes lint but now there are these "invalid" manifest files that we can't exclude or discern. So disable this lint error.
https://chromium-review.googlesource.com/c/chromium/src/+/1650265/14/build/android/AndroidManifest.xml
* We should specify the versions in GN files, so I did that here (by exactly copying the versions that are already in the targets' corresponding XML files), but we never want to get rid of them in the XML files. For now this information will just be duplicated (without any synchronicity check!) so there should be followup to this.
Change log: https://chromium.googlesource.com/chromium/src/+log/6ae0f0cd4c..bf62d746a4
Full diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/9e5e9332df..e5a1d1f652
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/5a031748ec..2ef566e990
* src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/6ae683be2f..6f3775ad6e
* src/buildtools/linux64: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9
* src/buildtools/mac: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9
* src/buildtools/win: git_revision:8c7f49102234f4f4b9349dcb258554675475e596..git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2f5c817266..7f1a97d593
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/1d4247de57..b1b36ff0d4
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/6f7cbf7c46..42e96c4074
* src/third_party/android_sdk/public: ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C..xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC
* src/third_party/android_sdk/public: iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC..ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC
* src/third_party/android_sdk/public: 4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C..MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/ed9fcf3f70..9e5dbd8b46
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/f58f33bca1..a9a4b8fc7b
DEPS diff: https://chromium.googlesource.com/chromium/src/+/6ae0f0cd4c..bf62d746a4/DEPS
No update to Clang.
Bug: chromium:891996
Change-Id: I773d6fa90e8083d934c84eecc1cb9d7d4496eca0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142235
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28311}
diff --git a/DEPS b/DEPS
index f0defbd..9545519 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': '6ae0f0cd4c5f74b9466f8bbf6d36e35e0886277b',
+ 'chromium_revision': 'bf62d746a4d96ae97fa65c85a49cfcc07283ca1b',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -24,7 +24,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': 'ed9fcf3f70a9ea62f2ada913b5289b7cd6a7e74d',
+ 'catapult_revision': '9e5dbd8b462b23d989f6ce32ae72fd2a8cb09ee3',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@@ -44,7 +44,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling GN CIPD package version
# and whatever else without interference from each other.
- 'gn_version': 'git_revision:8c7f49102234f4f4b9349dcb258554675475e596',
+ 'gn_version': 'git_revision:81ee1967d3fcbc829bac1c005c3da59739c88df9',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other.
@@ -52,11 +52,11 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_emulator_version
# and whatever else without interference from each other.
- 'android_sdk_emulator_version': 'ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C',
+ 'android_sdk_emulator_version': 'xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_extras_version
# and whatever else without interference from each other.
- 'android_sdk_extras_version': 'iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC',
+ 'android_sdk_extras_version': 'ppQ4TnqDvBHQ3lXx5KPq97egzF5X2FFyOrVHkGmiTMQC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_patcher_version
# and whatever else without interference from each other.
@@ -64,7 +64,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platform-tools_version
# and whatever else without interference from each other.
- 'android_sdk_platform-tools_version': '4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C',
+ 'android_sdk_platform-tools_version': 'MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platforms_version
# and whatever else without interference from each other.
@@ -86,11 +86,11 @@
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + '9e5e9332dfe6cefbbf542257fb8f0be2a6800ecc',
+ Var('chromium_git') + '/chromium/src/base' + '@' + 'e5a1d1f6528af11fc61b6f2d1e4f4b2d59c57b99',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '5a031748ec054bc66453e17a8319d0dc6ca71a68',
+ Var('chromium_git') + '/chromium/src/build' + '@' + '2ef566e990ceedfe78c06e5862870d40394e84ef',
'src/buildtools':
- Var('chromium_git') + '/chromium/src/buildtools' + '@' + '6ae683be2f0f5a29abfae3938f30a2e1bc890ff3',
+ Var('chromium_git') + '/chromium/src/buildtools' + '@' + '6f3775ad6eb9c0736d0aeb51faa6cff456d41601',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' +
@@ -98,13 +98,13 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '2f5c8172667bc239ff25104e9e60600c941af21f',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '7f1a97d593705217267d968c72c16a04252f51dc',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '1d4247de57436fd705e186a45959180c698b2194',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + 'b1b36ff0d46dd98ecbb15f56b5ecc0a7cb2a4b66',
'src/third_party':
- Var('chromium_git') + '/chromium/src/third_party' + '@' + '6f7cbf7c46240a59e56632785b35d1f7e7ccf854',
+ Var('chromium_git') + '/chromium/src/third_party' + '@' + '42e96c40740a688695a9cf5ed1ae29aed31867dd',
'src/buildtools/linux64': {
'packages': [
@@ -312,7 +312,7 @@
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + 'f58f33bca1a4267e2a51eeba8a40ae81ea454b79',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + 'a9a4b8fc7b038e6f8afa1da3d11203e2a49dfeb9',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index f33ec4d..eed9222 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -92,6 +92,8 @@
testonly = true
apk_name = "AppRTCMobile"
android_manifest = "androidapp/AndroidManifest.xml"
+ min_sdk_version = 16
+ target_sdk_version = 29
deps = [
":AppRTCMobile_javalib",
@@ -164,6 +166,8 @@
rtc_instrumentation_test_apk("AppRTCMobile_test_apk") {
apk_name = "AppRTCMobileTest"
android_manifest = "androidtests/AndroidManifest.xml"
+ min_sdk_version = 16
+ target_sdk_version = 21
java_files = [
"androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java",
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 7faec71..8a06c20 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -5,6 +5,8 @@
testonly = true
apk_name = "androidnativeapi"
android_manifest = "AndroidManifest.xml"
+ min_sdk_version = 19
+ target_sdk_version = 27
java_files = [
"java/org/webrtc/examples/androidnativeapi/MainActivity.java",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index e0fb603..3fb8c60 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -109,10 +109,12 @@
}
if (is_android) {
- android_apk("NetworkTesterMobile") {
+ rtc_android_apk("NetworkTesterMobile") {
testonly = true
apk_name = "NetworkTesterMobile"
android_manifest = "androidapp/AndroidManifest.xml"
+ min_sdk_version = 17
+ target_sdk_version = 24
deps = [
":NetworkTesterMobile_javalib",
@@ -123,7 +125,7 @@
shared_libraries = [ "../../rtc_tools/network_tester:network_tester_so" ]
}
- android_library("NetworkTesterMobile_javalib") {
+ rtc_android_library("NetworkTesterMobile_javalib") {
testonly = true
android_manifest_for_lint = "androidapp/AndroidManifest.xml"
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index b23cac9..22bb675 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1365,6 +1365,8 @@
rtc_instrumentation_test_apk("android_instrumentation_test_apk") {
apk_name = "android_instrumentation_test_apk"
android_manifest = "instrumentationtests/AndroidManifest.xml"
+ min_sdk_version = 16
+ target_sdk_version = 21
java_files = [
"instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java",
diff --git a/tools_webrtc/android/suppressions.xml b/tools_webrtc/android/suppressions.xml
index 45375c2..87b9387 100644
--- a/tools_webrtc/android/suppressions.xml
+++ b/tools_webrtc/android/suppressions.xml
@@ -37,6 +37,13 @@
<ignore path="**/org/chromium/**/*.java" />
</issue>
+ <issue id="UsesMinSdkAttributes">
+ <!-- TODO(oprypin): find a way to disable this warning just for Chromium's
+ code, not globally. Due to https://cs.chromium.org/lint_manifest_path
+ it is impossible to discern paths of AndroidManifest.xml files.-->
+ <ignore path="AndroidManifest.xml" />
+ </issue>
+
<issue id="NewApi">
<!-- This is rewritten by desugar after lint runs. -->
<ignore regexp="Call requires API level 19.*`java.util.Objects#requireNonNull`"/>
diff --git a/webrtc.gni b/webrtc.gni
index 3a8592d..77ed45f 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -847,12 +847,10 @@
# WebRTC supports API level 16 while Chromium only supports 19.
# (the manifest defines minimum supported SDK version)
- if (defined(invoker.android_manifest_for_lint)) {
- # Custom manifest defined by the target, use that one.
- android_manifest_for_lint = invoker.android_manifest_for_lint
+ if (defined(invoker.min_sdk_version)) {
+ min_sdk_version = invoker.min_sdk_version
} else {
- # Default manifest for WebRTC.
- android_manifest_for_lint = "//sdk/android/AndroidManifest.xml"
+ min_sdk_version = 16
}
# TODO(crbug.com/824679): Find out why this fails in Chromium
