Roll chromium_revision e4b02117a9..cc7b9c6822 (592264:592452)

Change log: e4b02117a9..cc7b9c6822
Full diff: e4b02117a9..cc7b9c6822

Changed dependencies
* src/base: 8130b147de..84eacf48e2
* src/ios: 7d51fa5227..e1bcf04272
* src/testing: fe4e1f210c..b1fa2ea487
* src/third_party: f29c2448d2..e49700f62c
* src/third_party/depot_tools: 07b5283a4e..69f640ec09
* src/tools: ae28316058..846c5a40f9
Added dependencies
* src/third_party/android_deps/libs/com_google_code_findbugs_jsr305
* src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations
* src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations
* src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual
DEPS diff: e4b02117a9..cc7b9c6822/DEPS

No update to Clang.

TBR=yvesg@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal

Partial revert of 1548e9a2959360b327f57d2b2851995b9d1a397f.


Fix ANDROID_DEPS tags in DEPS file.

We need the same tags than Chromium's DEPS for detection purpose.

Also, fix format (will reduce noise in subsequent diff).

Change-Id: I8607fd00be55680d65757c1e17ab08de42b2143d
Reviewed-on: https://webrtc-review.googlesource.com/101062
Reviewed-by: Yves Gerey <yvesg@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24777}
This commit is contained in:
Yves Gerey
2018-09-19 19:20:19 +02:00
committed by Commit Bot
parent 31eb01faa5
commit 3606cab8da
2 changed files with 86 additions and 30 deletions

View File

@ -382,7 +382,7 @@ def CalculateChangedDeps(webrtc_deps, new_cr_deps):
'WebRTC DEPS entry %s has a different URL (%s) than Chromium (%s).' %
(path, webrtc_deps_entry.url, cr_deps_entry.url))
else:
if path in WEBRTC_ONLY_DEPS:
if isinstance(webrtc_deps_entry, DepsEntry):
# Use the HEAD of the deps repo.
stdout, _ = _RunCommand(['git', 'ls-remote', webrtc_deps_entry.url,
'HEAD'])