Use OS-condition for more deps and hooks.

Sort alphabetically where it makes sense.

Bug: webrtc:8327
Change-Id: I723f0fda504be0da7fd0d8d6495b16e82b7bebde
Notry: True
Tested: Ran tools_webrtc/autoroller/roll_deps.py --dry-run successfully.
Reviewed-on: https://webrtc-review.googlesource.com/7617
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20207}
This commit is contained in:
Henrik Kjellander 2017-10-09 13:14:23 +02:00 committed by Commit Bot
parent 6b26975ceb
commit 5a17ea9b3f

529
DEPS
View File

@ -39,41 +39,104 @@ deps = {
Var('chromium_git') + '/chromium/src/build' + '@' + 'adaf9e56105b814105e2d49bc4fa63e2cd4795f5',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'f6d165d9d842ddd29056c127a5f3a3c5d8e0d2e3',
# Gradle 3.5.0. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' +
'941559e020f6c357ebb08d5c67acdb858a3defc2',
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '537db2157252bb7a48172a1b68344c0c8a0214d5',
'condition': 'checkout_ios',
},
'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + '9ea2ef7b17229b6ae44a58985e5d15bc29126a45',
'src/third_party':
Var('chromium_git') + '/chromium/src/third_party' + '@' + '637781b501f712a5d34a5fe11688d81f6157f524',
'src/third_party/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca9dc7245b888c75307f0619e4a39fb46a82de66',
'condition': 'checkout_android',
},
'src/third_party/boringssl/src':
Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'),
Var('boringssl_git') + '/boringssl.git' + '@' + Var('boringssl_revision'),
'src/third_party/catapult':
Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
'src/third_party/ced/src': {
'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9',
'condition': 'checkout_android',
},
'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' + '@' + '8db10a6fb1d4b86909b8cb32e3b53e35624c8979',
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '1e201feaa3260336aa63545c9471b76e5aef2e0a',
# WebRTC-only dependency (not present in Chromium).
'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c',
'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7f8fefabedf2965980585be8c2bff97458f28e0b',
'src/third_party/icu': {
'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '08cb956852a5ccdba7f9c941728bb833529ba3c6',
'condition': 'checkout_android',
},
'src/third_party/jsr-305/src': {
'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
'condition': 'checkout_android',
},
'src/third_party/jsoncpp/source':
Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
'src/third_party/junit/src': {
'url': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
'condition': 'checkout_android',
},
# Used for building libFuzzers (only supports Linux).
'src/third_party/libFuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + Var('libfuzzer_revision'),
'src/third_party/libjpeg_turbo':
Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd',
'src/third_party/libsrtp':
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '1d45b8e599dc2db6ea3ae22dbc94a8c504652423',
Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '1d45b8e599dc2db6ea3ae22dbc94a8c504652423',
'src/third_party/libvpx/source/libvpx':
Var('chromium_git') + '/webm/libvpx.git' + '@' + 'fe7b869104806752a26a262dc60923639d9a384f',
'src/third_party/libyuv':
Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '5b1af9a33545895ea12c52bf007f17914de19173',
'src/third_party/lss': {
'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
'condition': 'checkout_android or checkout_linux',
},
'src/third_party/mockito/src': {
'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
'condition': 'checkout_android',
},
'src/third_party/openh264/src':
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + 'a180c9d4d6f1a4830ca9eed9d159d54996bd63cb',
'src/third_party/openmax_dl':
Var('webrtc_git') + '/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
'src/third_party/requests/src': {
'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
'condition': 'checkout_android',
},
'src/third_party/robolectric/robolectric': {
'url': Var('chromium_git') + '/external/robolectric.git' + '@' + 'b02c65cc6d7465f58f0de48a39914aa905692afa',
'condition': 'checkout_android',
},
'src/third_party/ub-uiautomator/lib': {
'url': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434',
'condition': 'checkout_android',
},
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + 'f4819e1b177f7bfdd761c147f5a649b9f1a78c06',
# WebRTC-only dependency (not present in Chromium).
'src/third_party/winsdk_samples': {
'url': Var('webrtc_git') + '/deps/third_party/winsdk_samples_v71' + '@' + '2d31a1cbecc86359e6ec041fb9ff6c082babd073',
'condition': 'checkout_win',
},
# Dependency used by libjpeg-turbo.
'src/third_party/yasm/binaries': {
'url': Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881',
'condition': 'checkout_win',
},
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
@ -82,75 +145,6 @@ deps = {
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
# WebRTC-only dependencies (not present in Chromium).
'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c',
}
deps_os = {
'android': {
'src/third_party/android_tools': {
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca9dc7245b888c75307f0619e4a39fb46a82de66',
'condition': 'checkout_android',
},
'src/third_party/ced/src': {
'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9',
'condition': 'checkout_android',
},
'src/third_party/icu': {
'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '08cb956852a5ccdba7f9c941728bb833529ba3c6',
'condition': 'checkout_android',
},
'src/third_party/jsr-305/src': {
'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
'condition': 'checkout_android',
},
'src/third_party/junit/src': {
'url': Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
'condition': 'checkout_android',
},
'src/third_party/lss': {
'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
'condition': 'checkout_android',
},
'src/third_party/mockito/src': {
'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
'condition': 'checkout_android',
},
'src/third_party/requests/src': {
'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
'condition': 'checkout_android',
},
'src/third_party/robolectric/robolectric': {
'url': Var('chromium_git') + '/external/robolectric.git' + '@' + 'b02c65cc6d7465f58f0de48a39914aa905692afa',
'condition': 'checkout_android',
},
'src/third_party/ub-uiautomator/lib': {
'url': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434',
'condition': 'checkout_android',
},
# Gradle 3.5.0. Used for testing Android Studio project generation for WebRTC.
'src/examples/androidtests/third_party/gradle': {
'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' +
'941559e020f6c357ebb08d5c67acdb858a3defc2',
'condition': 'checkout_android',
},
},
'ios': {
'src/ios':
Var('chromium_git') + '/chromium/src/ios' + '@' + '537db2157252bb7a48172a1b68344c0c8a0214d5',
},
'unix': {
'src/third_party/lss':
Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
},
'win': {
# Dependencies used by libjpeg-turbo
'src/third_party/yasm/binaries':
Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881',
# WebRTC-only dependency (not present in Chromium).
'src/third_party/winsdk_samples':
Var('webrtc_git') + '/deps/third_party/winsdk_samples_v71' + '@' + '2d31a1cbecc86359e6ec041fb9ff6c082babd073',
},
}
hooks = [
@ -375,199 +369,208 @@ hooks = [
'--bucket', 'chromium-webrtc-resources',
'src/resources'],
},
{
# This downloads SDK extras and puts them in the
# third_party/android_tools/sdk/extras directory.
'name': 'sdkextras',
'pattern': '.',
'condition': 'checkout_android',
# When adding a new sdk extras package to download, add the package
# directory and zip file to .gitignore in third_party/android_tools.
'action': ['python',
'src/build/android/play_services/update.py',
'download'
],
},
{
'name': 'intellij',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-intellij',
'-l', 'third_party/intellij'
],
},
{
'name': 'javax_inject',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-javax-inject',
'-l', 'third_party/javax_inject'
],
},
{
'name': 'hamcrest',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-hamcrest',
'-l', 'third_party/hamcrest'
],
},
{
'name': 'guava',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-guava',
'-l', 'third_party/guava'
],
},
{
'name': 'android_support_test_runner',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-support-test-runner',
'-l', 'third_party/android_support_test_runner'
],
},
{
'name': 'byte_buddy',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-byte-buddy',
'-l', 'third_party/byte_buddy'
],
},
{
'name': 'espresso',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-espresso',
'-l', 'third_party/espresso'
],
},
{
'name': 'robolectric_libs',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-robolectric',
'-l', 'third_party/robolectric'
],
},
{
'name': 'apache_velocity',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-apache-velocity',
'-l', 'third_party/apache_velocity'
],
},
{
'name': 'ow2_asm',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-ow2-asm',
'-l', 'third_party/ow2_asm'
],
},
{
'name': 'desugar',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-tools/bazel/desugar',
'-l', 'third_party/bazel/desugar'
],
},
{
'name': 'icu4j',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-icu4j',
'-l', 'third_party/icu4j'
],
},
{
'name': 'accessibility_test_framework',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-accessibility-test-framework',
'-l', 'third_party/accessibility_test_framework'
],
},
{
'name': 'bouncycastle',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-bouncycastle',
'-l', 'third_party/bouncycastle'
],
},
{
'name': 'sqlite4java',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-sqlite4java',
'-l', 'third_party/sqlite4java'
],
},
{
'name': 'xstream',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-robolectric',
'-l', 'third_party/xstream'
],
},
{
'name': 'objenesis',
'pattern': '.',
'condition': 'checkout_android',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-objenesis',
'-l', 'third_party/objenesis'
],
},
]
# Note: These are keyed off target os, not host os. So don't move things here
# that depend on the target os.
hooks_os = {
'android': [
# Android dependencies. Many are downloaded using Google Storage these days.
# They're copied from https://cs.chromium.org/chromium/src/DEPS for all
# such dependencies we share with Chromium.
{
# This downloads SDK extras and puts them in the
# third_party/android_tools/sdk/extras directory.
'name': 'sdkextras',
'pattern': '.',
# When adding a new sdk extras package to download, add the package
# directory and zip file to .gitignore in third_party/android_tools.
'action': ['python',
'src/build/android/play_services/update.py',
'download'
],
},
{
'name': 'intellij',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-intellij',
'-l', 'third_party/intellij'
],
},
{
'name': 'javax_inject',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-javax-inject',
'-l', 'third_party/javax_inject'
],
},
{
'name': 'hamcrest',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-hamcrest',
'-l', 'third_party/hamcrest'
],
},
{
'name': 'guava',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-guava',
'-l', 'third_party/guava'
],
},
{
'name': 'android_support_test_runner',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-support-test-runner',
'-l', 'third_party/android_support_test_runner'
],
},
{
'name': 'byte_buddy',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-byte-buddy',
'-l', 'third_party/byte_buddy'
],
},
{
'name': 'espresso',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-espresso',
'-l', 'third_party/espresso'
],
},
{
'name': 'robolectric_libs',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-robolectric',
'-l', 'third_party/robolectric'
],
},
{
'name': 'apache_velocity',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-apache-velocity',
'-l', 'third_party/apache_velocity'
],
},
{
'name': 'ow2_asm',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-ow2-asm',
'-l', 'third_party/ow2_asm'
],
},
{
'name': 'desugar',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-android-tools/bazel/desugar',
'-l', 'third_party/bazel/desugar'
],
},
{
'name': 'icu4j',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-icu4j',
'-l', 'third_party/icu4j'
],
},
{
'name': 'accessibility_test_framework',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-accessibility-test-framework',
'-l', 'third_party/accessibility_test_framework'
],
},
{
'name': 'bouncycastle',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-bouncycastle',
'-l', 'third_party/bouncycastle'
],
},
{
'name': 'sqlite4java',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-sqlite4java',
'-l', 'third_party/sqlite4java'
],
},
{
'name': 'xstream',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-robolectric',
'-l', 'third_party/xstream'
],
},
{
'name': 'objenesis',
'pattern': '.',
'action': ['python',
'src/build/android/update_deps/update_third_party_deps.py',
'download',
'-b', 'chromium-objenesis',
'-l', 'third_party/objenesis'
],
},
],
}
recursedeps = [
# buildtools provides clang_format, libc++, and libc++abi.
'src/buildtools',