Commit graph

24 commits

Author SHA1 Message Date
Oleh Prypin
4cbb4ef817 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: 6ae0f0cd4c..bf62d746a4
Full diff: 6ae0f0cd4c..bf62d746a4

Changed dependencies
* src/base: 9e5e9332df..e5a1d1f652
* src/build: 5a031748ec..2ef566e990
* src/buildtools: 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: 2f5c817266..7f1a97d593
* src/testing: 1d4247de57..b1b36ff0d4
* src/third_party: 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: f58f33bca1..a9a4b8fc7b
DEPS diff: 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}
2019-06-18 17:10:06 +00:00
Oleksandr Iakovenko
53de7255b9 Fix outdated android sdk path in tests.
Bug: chromium:943507
Change-Id: Iffdf18a66485a98f08b2a556c1b3fa1e817fafba
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128607
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Oleksandr Iakovenko <iakovenko@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27224}
2019-03-21 12:18:19 +00:00
Artem Titarenko
69540f4419 Use android Nullable instead of javax Nullable
This is a propagation of upstream chromium change needed to
resume DEPS autorolls into WebRTC.

Original comment from upstream change:

> This change is made in preparation for an ErrorProne
> check to catch this at compile time. See bug for details.

Bug: chromium:771683
Change-Id: I56aed15f73a633dcadae7ece6c645cd3596f9257
Reviewed-on: https://webrtc-review.googlesource.com/c/113505
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Artem Titarenko <artit@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25951}
2018-12-10 15:03:58 +00:00
Artem Titarenko
25a3a97f59 Android: ignore LintError for absent class files
This is required to support changes in build/config repo
see https://chromium-review.googlesource.com/c/chromium/src/+/1308100

Bug: chromium:856189
Change-Id: I9571c52d46ee57e8d7aa45d17301529bd16d56d5
Reviewed-on: https://webrtc-review.googlesource.com/c/111102
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Artem Titarenko <artit@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25664}
2018-11-15 19:48:53 +00:00
Artem Titov
5d7a4c6692 Fixing py lint errors
Bug: webrtc:9548
Change-Id: I0daf8dc06fdaac1637c32994ef6ad542ed52202a
Reviewed-on: https://webrtc-review.googlesource.com/90045
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24068}
2018-07-23 15:28:48 +00:00
Artem Titov
81f5197512 Fix pylint presubmit errors and warnings from untouched modules.
BUG=None

Change-Id: I619dab14875e19477beb8bfb566ed1f34009c025
Reviewed-on: https://webrtc-review.googlesource.com/85960
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23754}
2018-06-27 09:31:29 +00:00
Yura Yaroshevich
f517f11fcb Additional switches to build_aar.py
Extra switches to GN could be passed via --extra-gn-switches.
Extra switches to Ninja could be passed via --extra-ninja-switches.
They could be used in different scenarios, when additional switches
need to be passed to GN or Ninja. For example, when diagnosing
build issues extra switch `-v` could be passed to enable
verbose logging of GN and Ninja.

Bug: None
Change-Id: I09d18a57b3df4e698784fb7d58c02e8adecddefa
Reviewed-on: https://webrtc-review.googlesource.com/78722
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23388}
2018-05-24 15:13:11 +00:00
Sami Kalliomäki
002e710d07 Add jsr305 as a dependency to AAR.
jsr305 is necessary dependency for Nullable annotations.

Also adds a flag to release_aar.py to specify the build directory
manually. This makes it easier to test the script without full
recompilation.

Bug: webrtc:8881
Change-Id: Ib4b8cd4592ced9c92ca2810928bcbb6173d2164e
Reviewed-on: https://webrtc-review.googlesource.com/65081
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22671}
2018-03-29 09:56:07 +00:00
Yura Yaroshevich
be7b88c145 Add additional comment for --extra-gn-args in build_aar.py.
Bug: webrtc:9003
Change-Id: I6387b097b13b82477bd161093c00985070147953
Reviewed-on: https://webrtc-review.googlesource.com/61323
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22402}
2018-03-13 15:26:51 +00:00
Sami Kalliomäki
91e26fd94e Integrate uninstalling previous versions into AAR release script.
This allows the script to be reliably run on the bots.

Bug: webrtc:8365
Change-Id: Ie4f216403c1f4fabe8db07f261fe06d1e64be0ae
Reviewed-on: https://webrtc-review.googlesource.com/42720
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21717}
2018-01-22 14:50:28 +00:00
Patrik Höglund
dde8702f11 Remove unused manifest.
This used to be used by the linter, but now it's actually using
build/android/AndroidManifest.xml to determine the minimum SDK
level we support.

Remove this file to avoid confusion.

Bug: None
Change-Id: I2ea60854d52276877ae9d51a9c1f379cfaa3ed5d
Reviewed-on: https://webrtc-review.googlesource.com/40661
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21677}
2018-01-18 14:24:48 +00:00
Oleh Prypin
1ea1875c13 Add sakal to tools_webrtc/android/OWNERS
Bug: None
No-Try: True
Change-Id: Id236c09b89489c48160928c2ffabb078bc559c66
Reviewed-on: https://webrtc-review.googlesource.com/40640
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21676}
2018-01-18 12:45:07 +00:00
Oleh Prypin
b34970f3ea Ignore invalid lint errors for Java 8 features.
These features are supported via desugar, but we started getting lint errors:
"Static interface  method requires API level 24 (current min is 16)"
60990c11ce

Bug: webrtc:8084
Change-Id: Iba8b5825a52bd57da7ee4ab52cde2d7bd9ebce30
Reviewed-on: https://webrtc-review.googlesource.com/40421
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21672}
2018-01-18 11:25:12 +00:00
Edward Lemur
1b7f988144 Roll Chromium + Fix Android lint suppressions
* Roll chromium_revision 5bd5874cbf..840e0f7269 (519731:520123)
* Suppress NewApi lint warnings from Chromium.
* Suppress NewApi lint warnings for WebRTCAudio{Track,Utils}.java
* Suppress deprecation warnings for
  FLAG_SHOW_WHEN_LOCKED and FLAG_TURN_SCREEN_ON in LayoutParams
  in examples/androidapp/src/org/appspot/apprtc/CallActivity.java

Change log: 5bd5874cbf..840e0f7269
Full diff: 5bd5874cbf..840e0f7269

Changed dependencies:
* src/base: fc034c4143..5dfdb70192
* src/build: f0766940d5..b1a63aeccd
* src/ios: 49bd74cee7..597d6a0451
* src/testing: 373652d16f..119295dad5
* src/third_party: 34c5bb433a..38215cc4ef
* src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/9914c57047..a2e9bc7c1b
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/230a61040f..b0b1ce2c6e
* src/third_party/depot_tools: 1b30125fbc..9e51906ffb
* src/third_party/ffmpeg: 9cb03e5705..18c815f814
* src/tools: 8d915c324e..d5795c8019
DEPS diff: 5bd5874cbf..840e0f7269/DEPS

No update to Clang.

Bug: webrtc:8580
Change-Id: I6b78fd2d10c1f790a7606c19982f00c6a3dde968
Reviewed-on: https://webrtc-review.googlesource.com/26640
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Henrik Grunell <henrikg@webrtc.org>
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20958}
2017-11-30 16:59:50 +00:00
Sami Kalliomäki
34d4e5a4d1 Remove LongLogTag warning suppression.
Bug: webrtc:6597
Change-Id: I9defe65a19b6e85738fe2a46dad38f999a5d8594
Reviewed-on: https://webrtc-review.googlesource.com/21300
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20699}
2017-11-16 08:35:33 +00:00
Sami Kalliomäki
ec6cf2a94f Cleanup old suppressions from suppressions.xml.
Limits CpuMonitor to supported Android versions.

Bug: webrtc:6597
Change-Id: I15fb4f5dff2511f578069dd70521728e9909bd15
Reviewed-on: https://webrtc-review.googlesource.com/21225
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20626}
2017-11-10 10:38:05 +00:00
Henrik Kjellander
ec57e05410 Update scripts to use DEPS-pinned depot_tools
Always use gn.py in depot_tools instead of just gn.
The https://cs.chromium.org/chromium/src/build/find_depot_tools.py
is looking up the DEPS-pinned copy in third_party/depot_tools
and adds it to the path when add_depot_tools_to_path() is called.

Similar use:
 

https: //cs.chromium.org/search/?q=%22find_depot_tools.add_depot_tools_to_path()%22&sq=package:chromium&type=cs
Bug: webrtc:8393
Change-Id: I3cfa3d96b4d0f60e8099e556876bc94340b1bbb5
Reviewed-on: https://webrtc-review.googlesource.com/12540
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@google.com>
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20333}
2017-10-18 12:06:19 +00:00
Sami Kalliomäki
201509b1c1 Add testing and auto-publish features to release_aar.py.
Bug: webrtc:8365
Change-Id: I6dda3773d62ea37d371933691144499ba17898d7
Reviewed-on: https://webrtc-review.googlesource.com/7614
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20274}
2017-10-13 09:53:27 +00:00
Sami Kalliomäki
dbb15a7ce2 Script for publishing WebRTC AAR on Bintray.
Bintray is a service for hosting repositories. It is widely used to
serve precompiled Android binaries because of the integration with
JCenter. This script uploads a precompiled WebRTC Android library to
a Bintray repository.

Bug: webrtc:8182
Change-Id: I7be04cea59827e28470acd934f6e09fc3abe2a72
Reviewed-on: https://webrtc-review.googlesource.com/4441
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20168}
2017-10-05 14:47:31 +00:00
Henrik Kjellander
03ec4f8188 Update build_aar.py after webrtc/ dir was removed.
BUG=chromium:769258
NOTRY=True

Change-Id: Ibdc36b3a962a980460147f907353461d29da628c
Reviewed-on: https://webrtc-review.googlesource.com/4142
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20001}
2017-09-27 14:40:16 +00:00
korniltsev.anatoly
0b510a9946 Add --build_dir arg to build_aar.py
This will enable incremental build for aar

BUG=None

Review-Url: https://codereview.webrtc.org/3008973002
Cr-Commit-Position: refs/heads/master@{#19689}
2017-09-05 15:12:30 +00:00
sakal
67e414ce70 License generation script for build_aar.py.
The script is forked from: tools_webrtc/ios/generate_licenses.py

BUG=webrtc:8182

Review-Url: https://codereview.webrtc.org/3011613002
Cr-Commit-Position: refs/heads/master@{#19679}
2017-09-05 07:16:15 +00:00
ehmaldonado
fe43df155c Ignore NewApi Android Lint warning + Roll chromium_revision
Ignore NewApi and InlinedApi Android Lint warnings.
They will be enabled once platform-tools is rolled. See crbug.com/739746.

This is needed because of 6e3237729a

Roll chromium_revision 1238950005..fd8f995919 (488218:488572)

Change log: 1238950005..fd8f995919
Full diff: 1238950005..fd8f995919

Changed dependencies:
* src/base: 9590d17c3d..ff92886fed
* src/build: 36a077c7b3..995d75919a
* src/ios: 342e327240..d8aae3bcad
* src/testing: 718dcd6f4b..639e83fbfc
* src/third_party: 8ac1939776..6fc19207c5
* src/third_party/catapult: c7c5420fbc..e11a4d0d82
* src/third_party/ffmpeg: d19b0ad9b2..97ebed6795
* src/tools: 030de9aca2..50cda24eac
DEPS diff: 1238950005..fd8f995919/DEPS

No update to Clang.

TBR=
NOTRY=True
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal

Review-Url: https://codereview.webrtc.org/2986603002
Cr-Commit-Position: refs/heads/master@{#19119}
2017-07-24 09:51:58 +00:00
Henrik Kjellander
90fd7d84fd Rename tools-webrtc -> tools_webrtc
This aligns with established naming convention for all
other directories.

BUG=webrtc:7593
NOTRY=True
NOTREECHECKS=True
R=ehmaldonado@webrtc.org, mbonadei@webrtc.org
TBR=henrika@webrtc.org

Review-Url: https://codereview.webrtc.org/2864213004 .
Cr-Commit-Position: refs/heads/master@{#18059}
2017-05-09 06:30:13 +00:00