zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision e4b02117a9..cc7b9c6822 (592264:592452)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

114
DEPS
View File

@ -7,7 +7,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': 'e4b02117a9359cc7f27811af64f39c8475160c31',
'chromium_revision': 'cc7b9c6822f296b79bd26587379ee74120211bb6',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -42,7 +42,7 @@ deps = {
# 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' + '@' + '8130b147ded5c85cd4df63ecf50089c4607b6855',
Var('chromium_git') + '/chromium/src/base' + '@' + '84eacf48e290585557be687e161f35ba891bab49',
'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + '786a3d91789d6f5f60a15dd13cd2ffeeee59a528',
'src/buildtools':
@ -54,13 +54,13 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '7d51fa5227367d91dd3cb232565d419ec31b8eb4',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'e1bcf042728b596d7f003008c562aaa7ac351816',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + 'fe4e1f210cb9effaecaa9cdf8bab9c09516cd699',
Var('chromium_git') + '/chromium/src/testing' + '@' + 'b1fa2ea4873a28a5b86efad75f1cac150e5ff557',
'src/third_party':
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'f29c2448d232d7902418ba4ed0c3f0a49634da3d',
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'e49700f62c406e848160ec20b10db27f5f65095b',
'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
'condition': 'checkout_android',
@ -84,7 +84,7 @@ deps = {
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '07b5283a4ea1056007f6c2ec233411b72caa3227',
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '69f640ec0900add7fd44579c181fa99ea1693005',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
@ -195,7 +195,7 @@ deps = {
'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' + '@' + 'ae28316058ec7c50a868ac9eb833e474a69b7290',
Var('chromium_git') + '/chromium/src/tools' + '@' + '846c5a40f9d1b940d9675fae2a52287ea8a13231',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
@ -386,10 +386,10 @@ deps = {
'dep_type': 'cipd',
},
# === ANDROID_DEPS Start ===
# Copied from chromium/src/DEPS, which in turn are generated by
# //tools/android/roll/android_deps/fetch_all.py.
'src/third_party/android_deps/libs/android_arch_core_common': {
# Everything coming after this is automatically updated by the auto-roller.
# === ANDROID_DEPS Generated Code Start ===
# Generated by //tools/android/roll/android_deps/fetch_all.py
'src/third_party/android_deps/libs/android_arch_core_common': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/android_arch_core_common',
@ -906,6 +906,17 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_code_findbugs_jsr305',
'version': 'version:1.3.9-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_dagger_dagger': {
'packages': [
{
@ -940,15 +951,26 @@ deps = {
},
'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
'version': 'version:2.17-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
'version': 'version:2.17-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
'version': 'version:2.1.3-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': {
'packages': [
@ -983,6 +1005,17 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations',
'version': 'version:1.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/com_squareup_javapoet': {
'packages': [
{
@ -1006,16 +1039,39 @@ deps = {
},
'src/third_party/android_deps/libs/javax_inject_javax_inject': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
'version': 'version:1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
'version': 'version:1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
# === ANDROID_DEPS End ===
'src/third_party/android_deps/libs/org_checkerframework_checker_compat_qual': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_checkerframework_checker_compat_qual',
'version': 'version:2.3.0-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations',
'version': 'version:1.14-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
# === ANDROID_DEPS Generated Code End ===
}
hooks = [

2
tools_webrtc/autoroller/roll_deps.py
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'])