diff options
| author | Oleh Prypin <oprypin@webrtc.org> | 2019-06-18 17:09:51 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-18 17:10:06 +0000 |
| commit | 4cbb4ef8176c46b8f7004f79fc36e2ba3a70c8bc (patch) | |
| tree | b58cae9d8181fc3045cade8d17924e3486608a61 /examples | |
| parent | b762b5b794f49f5986dd83c50c81b7e5a57a8411 (diff) | |
| download | webrtc-4cbb4ef8176c46b8f7004f79fc36e2ba3a70c8bc.tar.gz | |
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}
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/BUILD.gn | 4 | ||||
| -rw-r--r-- | examples/androidnativeapi/BUILD.gn | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/BUILD.gn b/examples/BUILD.gn index f33ec4dad6..eed92229cc 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -92,6 +92,8 @@ if (is_android) { 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 @@ if (is_android) { 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 7faec71b4d..8a06c20a53 100644 --- a/examples/androidnativeapi/BUILD.gn +++ b/examples/androidnativeapi/BUILD.gn @@ -5,6 +5,8 @@ if (is_android) { 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", |