admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android SDK] Update to version 'Q' (29) to unblock autoroller/roll_deps.py

Browse Source 
Similarly to [1], this fixes the current autoroller breakage [2]
by manually pre-updating the cipd package versions for
'third_party/android_sdk/public'.

For consistency sake //src/build has been updated to [3].

[1] https://webrtc-review.googlesource.com/c/src/+/158884
[2] https://logs.chromium.org/logs/webrtc/buildbucket/cr-buildbucket.appspot.com/8896958712762421712/+/steps/autoroll_DEPS/0/stdout
[3] da9baf4669

Bug: webrtc:11095, chromium:1003532
Change-Id: Ib01143ec270ecc37eb82d061ae5d011059afd17a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159929
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@google.com>
Cr-Commit-Position: refs/heads/master@{#29833}
This commit is contained in:
Yves Gerey 2019-11-19 14:04:18 +01:00 committed by Commit Bot
parent 063c7d18c0
commit 67e5bd3442
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DEPS
View File

@ -5,7 +5,7 @@ vars = {
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'chromium_revision': '0717a4dc313ba6715d096c33a9c5e1365f9b1284',
'chromium_revision': 'c2481863282a401926e0ee479334c68ec362d302',
}
deps = {
@ -14,7 +14,7 @@ deps = {
'src/base':
'https://chromium.googlesource.com/chromium/src/base@c2926851da547ceda14235cfd6dc8a72dbabaa7f',
'src/build':
'https://chromium.googlesource.com/chromium/src/build@7e97a0cab37370205309957c0139b3b7449f6801',
'https://chromium.googlesource.com/chromium/src/build@da9baf4669eb13e5432220ff5030af3cfacfd33d',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@140e4d7c45ffb55ce5dc4d11a0c3938363cd8257',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@ -378,12 +378,12 @@ deps = {
'src/third_party/android_sdk/public': {
'packages': [
{
'package': 'chromium/third_party/android_sdk/public/build-tools',
'version': '5DL7LQQjVMLClXLzLgmGysccPGsGcjJdvH9z5-uetiIC',
'package': 'chromium/third_party/android_sdk/public/build-tools/29.0.2',
'version': 'n-b1Qd7iFb8qzHlr1C_jIeu070UDgO_BwePtH42UqGcC',
},
{
'package': 'chromium/third_party/android_sdk/public/emulator',
'version': 'xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC',
'version': 'f4WdgkPvDdVCE8zBWPzcSIj4N9WFhKp3CSKDWylXuLEC',
},
{
'package': 'chromium/third_party/android_sdk/public/extras',
@ -395,15 +395,15 @@ deps = {
},
{
'package': 'chromium/third_party/android_sdk/public/platform-tools',
'version': 'MSnxgXN7IurL-MQs1RrTkSFSb8Xd1UtZjLArI8Ty1FgC',
'version': 'n5NRtk1IRM87UHkSNPKGfMf6VL_BfjEOBXhD9uqynhIC',
},
{
'package': 'chromium/third_party/android_sdk/public/platforms',
'version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC',
'package': 'chromium/third_party/android_sdk/public/platforms/android-29',
'version': 'yb33klKQV9UzzB-lDSsq36vzhTXOUZ2aRONBvPGwvdcC',
},
{
'package': 'chromium/third_party/android_sdk/public/sources',
'version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC',
'package': 'chromium/third_party/android_sdk/public/sources/android-29',
'version': '4gxhM8E62bvZpQs7Q3d0DinQaW0RLCIefhXrQBFkNy8C',
},
{
'package': 'chromium/third_party/android_sdk/public/tools',

5
tools_webrtc/autoroller/roll_deps.py
View File

@ -683,8 +683,9 @@ def main():
removed_generated_android_deps, other_deps = FindRemovedDeps(webrtc_deps,
new_cr_deps)
if other_deps:
raise RollError('WebRTC DEPS entries are missing from Chromium: %s. '
'Remove them or add them to DONT_AUTOROLL_THESE.' % other_deps)
raise RollError('WebRTC DEPS entries are missing from Chromium: %s.\n'
'Remove them or add them to either '
'WEBRTC_ONLY_DEPS or DONT_AUTOROLL_THESE.' % other_deps)
clang_change = CalculateChangedClang(rev_update.new_chromium_rev)
commit_msg = GenerateCommitMessage(
rev_update, current_commit_pos, new_commit_pos, changed_deps,