| commit | 4cbb4ef8176c46b8f7004f79fc36e2ba3a70c8bc | [log] [tgz] |
|---|---|---|
| author | Oleh Prypin <oprypin@webrtc.org> | Tue Jun 18 17:09:51 2019 +0200 |
| committer | Commit Bot <commit-bot@chromium.org> | Tue Jun 18 17:10:06 2019 +0000 |
| tree | b58cae9d8181fc3045cade8d17924e3486608a61 | |
| parent | b762b5b794f49f5986dd83c50c81b7e5a57a8411 [diff] [blame] |
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/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