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

Move CIPD dependencies into DEPS

Browse Source 
These can't be auto-rolled (yet) but we need to follow
Chromium with this way of specifying dependencies, because
"Android CIPD Ensure" is gone.

Bug: chromium:755920
Change-Id: Iac952db98f0b382b69bc87a109b5c2b284f122ed
Reviewed-on: https://webrtc-review.googlesource.com/54960
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22089}
This commit is contained in:
Oleh Prypin 2018-02-19 18:43:17 +01:00 committed by Commit Bot
parent 6e9c00f809
commit e18e269d46
1 changed files with 198 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
DEPS
View File

@ -164,6 +164,204 @@ deps = {
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
'src/third_party/accessibility_test_framework': {
'packages': [
{
'package': 'chromium/third_party/accessibility-test-framework',
'version': 'version:2.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_support_test_runner': {
'packages': [
{
'package': 'chromium/third_party/android_support_test_runner',
'version': 'version:0.5-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/apk-patch-size-estimator': {
'packages': [
{
'package': 'chromium/third_party/apk-patch-size-estimator',
'version': 'version:0.2-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/bazel': {
'packages': [
{
'package': 'chromium/third_party/bazel',
'version': 'version:0.10.0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/bouncycastle': {
'packages': [
{
'package': 'chromium/third_party/bouncycastle',
'version': 'version:1.46-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/byte_buddy': {
'packages': [
{
'package': 'chromium/third_party/byte_buddy',
'version': 'version:1.4.17-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/espresso': {
'packages': [
{
'package': 'chromium/third_party/espresso',
'version': 'version:2.2.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/gson': {
'packages': [
{
'package': 'chromium/third_party/gson',
'version': 'version:2.8.0-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/guava': {
'packages': [
{
'package': 'chromium/third_party/guava',
'version': 'version:23.0-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/hamcrest': {
'packages': [
{
'package': 'chromium/third_party/hamcrest',
'version': 'version:1.3-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/icu4j': {
'packages': [
{
'package': 'chromium/third_party/icu4j',
'version': 'version:53.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/intellij': {
'packages': [
{
'package': 'chromium/third_party/intellij',
'version': 'version:12.0-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/javax_inject': {
'packages': [
{
'package': 'chromium/third_party/javax_inject',
'version': 'version:1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/objenesis': {
'packages': [
{
'package': 'chromium/third_party/objenesis',
'version': 'version:2.4-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/ow2_asm': {
'packages': [
{
'package': 'chromium/third_party/ow2_asm',
'version': 'version:5.0.1-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/robolectric': {
'packages': [
{
'package': 'chromium/third_party/robolectric',
'version': 'version:3.5.1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/sqlite4java': {
'packages': [
{
'package': 'chromium/third_party/sqlite4java',
'version': 'version:0.282-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/xstream': {
'packages': [
{
'package': 'chromium/third_party/xstream',
'version': 'version:1.4.8-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
}
hooks = [
@ -479,15 +677,6 @@ hooks = [
'--bucket', 'chromium-webrtc-resources',
'src/resources'],
},
{
'name': 'Android CIPD Ensure',
'pattern': '.',
'condition': 'checkout_android',
'action': ['src/build/cipd/cipd_wrapper.py',
'--chromium-root', 'src',
'--ensure-file', 'src/build/cipd/android/android.ensure',
],
},
{
# This downloads SDK extras and puts them in the
# third_party/android_tools/sdk/extras directory.