aboutsummaryrefslogtreecommitdiff
path: root/files/DEPS
diff options
context:
space:
mode:
Diffstat (limited to 'files/DEPS')
-rw-r--r--files/DEPS1097
1 files changed, 876 insertions, 221 deletions
diff --git a/files/DEPS b/files/DEPS
index 803f481f..c5f81b86 100644
--- a/files/DEPS
+++ b/files/DEPS
@@ -1,44 +1,79 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
- 'chromium_revision': 'da7cc8ca4c326895886b10df62d513fac256d74f',
- 'swarming_revision': '11e31afa5d330756ff87aa12064bb5d032896cb5',
+ 'chromium_revision': '4476bd69d1c8e4e1cde8633d3b33c992f7d3a6d0',
+ 'swarming_revision': '0e3e1c4dc4e79f25a5b58fcbc135dc93183c0c54',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss
# and whatever else without interference from each other.
- 'lss_revision': '63f24c8221a229f677d26ebe8f3d1528a9d787ac',
+ 'lss_revision': 'e6527b0cd469e3ff5764785dadcb39bf7d787154',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': '49eb11f63eb4d552d634833a01d2710208ba0523',
+ 'catapult_revision': 'a24a725f7834c16b3628bfb63f349b3480bf9592',
+ # the commit queue can handle CLs rolling android_sdk_build-tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_build-tools_version': 'DLK621q5_Bga5EsOr7cp6bHWWxFKx6UHLu_Ix_m3AckC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_emulator_version
+ # and whatever else without interference from each other.
+ 'android_sdk_emulator_version': 'ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_extras_version
+ # and whatever else without interference from each other.
+ 'android_sdk_extras_version': 'iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_patcher_version
+ # and whatever else without interference from each other.
+ 'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_platform-tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_platform-tools_version': '4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_platforms_version
+ # and whatever else without interference from each other.
+ 'android_sdk_platforms_version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_sources_version
+ # and whatever else without interference from each other.
+ 'android_sdk_sources_version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_tools_version
+ # and whatever else without interference from each other.
+ 'android_sdk_tools_version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC',
+ # Three lines of non-changing comments so that
+ # the commit queue can handle CLs rolling android_sdk_tools-lint_version
+ # and whatever else without interference from each other.
+ 'android_sdk_tools-lint_version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC',
}
deps = {
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '15013685bdd59b8e548ffdef88b6fddae4f0e49c',
+ Var('chromium_git') + '/chromium/src/build' + '@' + '669e41d6f18842ed5740449662a71b715dc607c6',
'src/buildtools':
- Var('chromium_git') + '/chromium/buildtools.git' + '@' + '88811f48a6b79786ef35be86825642fc33011151',
+ Var('chromium_git') + '/chromium/buildtools.git' + '@' + '0e1cbc4eab6861b0c84bf2ed9a3c4b7aa2063819',
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '6885521e316f349c47c4f23f5bce9bd44cb0eece',
- 'src/testing/gtest':
- Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '6f8a66431cb592dad629028a50b3dd418a408c87',
- 'src/testing/gmock':
- Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be', # from svn revision 566
+ Var('chromium_git') + '/chromium/src/testing' + '@' + 'b1c6aeebeabcc177a83ff0a33dc6c3ab03d4aa94',
'src/third_party':
- Var('chromium_git') + '/chromium/src/third_party' + '@' + 'be0a7d2accc6d1e69eb9fa005d98e1558b9227ff',
+ Var('chromium_git') + '/chromium/src/third_party' + '@' + 'be3e0fc18f2e9ea14d0e9369e539eae5986335fd',
'src/third_party/catapult':
- Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' + Var('catapult_revision'),
+ Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
+ 'src/third_party/freetype/src':
+ Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'd01e28f41f8810c8ea422b854f8722659589fa99',
+ 'src/third_party/googletest/src':
+ Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '879ac092fde0a19e1b3a61b2546b2a422b1528bc',
+ 'src/third_party/harfbuzz-ng/src':
+ Var('chromium_git') + '/external/github.com/harfbuzz/harfbuzz.git' + '@' + '26c5b54fb09fb45e02c9c4618bcea4958c698953',
'src/third_party/libjpeg_turbo':
- Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '7260e4d8b8e1e40b17f03fafdf1cd83296900f76',
+ Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + '61a2bbaa9aec89cb2c882d87ace6aba9aee49bb9',
'src/third_party/yasm/source/patched-yasm':
- Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
+ Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + '80ce3971a8a250e9d0180e38a29553273877166c',
- 'src/tools/gyp':
- Var('chromium_git') + '/external/gyp.git' + '@' + 'e7079f0e0e14108ab0dba58728ff219637458563',
- 'src/tools/swarming_client':
- Var('chromium_git') + '/external/swarming.client.git' + '@' + Var('swarming_revision'),
+ Var('chromium_git') + '/chromium/src/tools' + '@' + '419541c8352b3b75a99c9a5a7c0d1e7b92f3fcf7',
+ 'src/tools/swarming_client':
+ Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
# libyuv-only dependencies (not present in Chromium).
'src/third_party/gflags':
@@ -47,44 +82,780 @@ deps = {
Var('chromium_git') + '/external/github.com/gflags/gflags' + '@' + '03bebcb065c83beff83d50ae025a55a4bf94dfca',
'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/webrtc/deps/third_party/gtest-parallel' + '@' + '1dad0e9f6d82ff994130b529d7d814b40eb32b0e',
-}
-deps_os = {
- 'android': {
- 'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + '636a52bf9d2ab7ea4e97d0a933bbd5706acbbc7c',
- 'src/third_party/android_tools':
- Var('chromium_git') + '/android_tools.git' + '@' + 'b65c4776dac2cf1b80e969b3b2d4e081b9c84f29',
- 'src/third_party/ced/src':
- Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + 'e21eb6aed10b9f6e2727f136c52420033214d458',
- 'src/third_party/icu':
- Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'b34251f8b762f8e2112a89c587855ca4297fed96',
- 'src/third_party/jsr-305/src':
- Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
- 'src/third_party/junit/src':
- Var('chromium_git') + '/external/junit.git' + '@' + '64155f8a9babcfcf4263cf4d08253a1556e75481',
- 'src/third_party/lss':
- Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
- 'src/third_party/mockito/src':
- Var('chromium_git') + '/external/mockito/mockito.git' + '@' + 'de83ad4598ad4cf5ea53c69a8a8053780b04b850',
- 'src/third_party/requests/src':
- Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
- 'src/third_party/robolectric/robolectric':
- Var('chromium_git') + '/external/robolectric.git' + '@' + 'e38b49a12fdfa17a94f0382cc8ffaf69132fd09b',
- },
- 'ios': {
- 'src/ios':
- Var('chromium_git') + '/chromium/src/ios' + '@' + '9d4d917abc902ad9eb512839948b880194f76338',
- },
- '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',
+ 'src/third_party/lss': {
+ 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
+ 'condition': 'checkout_android or checkout_linux',
+ },
+
+ # Android deps:
+ '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/auto/src': {
+ 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82',
+ 'condition': 'checkout_android',
+ },
+ 'src/base': {
+ 'url': Var('chromium_git') + '/chromium/src/base' + '@' + '162a5d66ad148f26bbbe6b6ecaf5c1bafa2173e6',
+ 'condition': 'checkout_android',
+ },
+ '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/android_ndk': {
+ 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
+ 'condition': 'checkout_android',
+ },
+ '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/android_tools': {
+ 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'e958d6ea74442d4e0849bb8a018d215a0e78981d',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/android_sdk/public': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_sdk/public/build-tools',
+ 'version': Var('android_sdk_build-tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/emulator',
+ 'version': Var('android_sdk_emulator_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/extras',
+ 'version': Var('android_sdk_extras_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/patcher',
+ 'version': Var('android_sdk_patcher_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/platform-tools',
+ 'version': Var('android_sdk_platform-tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/platforms',
+ 'version': Var('android_sdk_platforms_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/sources',
+ 'version': Var('android_sdk_sources_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/tools',
+ 'version': Var('android_sdk_tools_version'),
+ },
+ {
+ 'package': 'chromium/third_party/android_sdk/public/tools-lint',
+ 'version': Var('android_sdk_tools-lint_version'),
+ },
+ ],
+ 'condition': 'checkout_android_native_support',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/android_build_tools/aapt2': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_tools_aapt2',
+ 'version': 'version:3.2.0-alpha18-4804415-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/ced/src': {
+ 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/errorprone/lib': {
+ 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/findbugs': {
+ 'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67',
+ 'condition': 'checkout_android',
+ },
+ '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/icu': {
+ 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd65301491c513d49163ad29c853eb85c02c8d5b4',
+ },
+ '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/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/mockito/src': {
+ 'url': Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '04a2a289a4222f80ad20717c25144981210d2eac',
+ 'condition': 'checkout_android',
+ },
+ '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/r8': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/r8',
+ 'version': 'version:1.0.30',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/proguard': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/proguard',
+ 'version': '3bd778c422ea5496de2ef25c007a517dbb5ce5ca',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/requests/src': {
+ 'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/robolectric': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/robolectric',
+ 'version': 'version:3.5.1',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/robolectric/robolectric': {
+ 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/sqlite4java': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/sqlite4java',
+ 'version': 'version:0.282-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+ 'src/third_party/ub-uiautomator/lib': {
+ 'url': Var('chromium_git') + '/chromium/third_party/ub-uiautomator.git' + '@' + '00270549ce3161ae72ceb24712618ea28b4f9434',
+ 'condition': 'checkout_android',
+ },
+ 'src/third_party/xstream': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/xstream',
+ 'version': 'version:1.4.8-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ # iOS deps:
+ 'src/ios': {
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '44be3c093cf2db7ab4cf1997d6a1a07722f1f391',
+ 'condition': 'checkout_ios'
+ },
+
+ # Win deps:
+ # Dependencies used by libjpeg-turbo
+ 'src/third_party/yasm/binaries': {
+ 'url': Var('chromium_git') + '/chromium/deps/yasm/binaries.git' + '@' + '52f9b3f4b0aa06da24ef8b123058bb61ee468881',
+ 'condition': 'checkout_win',
+ },
+
+ # === ANDROID_DEPS Generated Code Start ===
+ # Generated by //tools/android/roll/android_deps/fetch_all.sh
+ 'src/third_party/android_deps/libs/android_arch_core_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/android_arch_core_common',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/android_arch_lifecycle_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_common',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/android_arch_lifecycle_runtime',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_animated_vector_drawable': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_animated_vector_drawable',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_appcompat_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_appcompat_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_cardview_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_cardview_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_design': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_design',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_gridlayout_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_gridlayout_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_leanback_v17': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_leanback_v17',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_mediarouter_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_mediarouter_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_multidex': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_multidex',
+ 'version': 'version:1.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_palette_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_palette_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_preference_leanback_v17': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_leanback_v17',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_preference_v14': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_v14',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_preference_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_preference_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_recyclerview_v7': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_recyclerview_v7',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_annotations': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_annotations',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_compat': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_compat',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_core_ui': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_ui',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_core_utils': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_core_utils',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_fragment': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_fragment',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_media_compat': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_media_compat',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_v13': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v13',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_v4': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_v4',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_support_vector_drawable': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_support_vector_drawable',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_android_support_transition': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_android_support_transition',
+ 'version': 'version:27.0.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
},
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_base': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_base',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_basement': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_basement',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_fido': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_fido',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_gcm': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_gcm',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_iid': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_iid',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_location': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_location',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_tasks': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_tasks',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common',
+ 'version': 'version:12.0.1-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_google_android_play_core': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_google_android_play_core',
+ 'version': 'version:1.3.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ 'src/third_party/android_deps/libs/com_squareup_javapoet': {
+ 'packages': [
+ {
+ 'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet',
+ 'version': 'version:1.11.0-cr0',
+ },
+ ],
+ 'condition': 'checkout_android',
+ 'dep_type': 'cipd',
+ },
+
+ # === ANDROID_DEPS Generated Code End ===
}
# Define rules for which include paths are allowed in our source.
@@ -116,180 +887,41 @@ hooks = [
'src',
],
},
- # 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'
- ],
- },
+ # Downloads the current stable linux sysroot to build/linux/ if needed.
{
- 'name': 'apache_velocity',
+ 'name': 'sysroot_arm',
'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': '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'
- ],
+ 'condition': 'checkout_linux and checkout_arm',
+ 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=arm'],
},
{
- 'name': 'bouncycastle',
+ 'name': 'sysroot_arm64',
'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-bouncycastle',
- '-l', 'third_party/bouncycastle'
- ],
+ 'condition': 'checkout_linux and checkout_arm64',
+ 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=arm64'],
},
{
- 'name': 'sqlite4java',
+ 'name': 'sysroot_x86',
'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-sqlite4java',
- '-l', 'third_party/sqlite4java'
- ],
+ 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)',
+ 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=x86'],
},
{
- 'name': 'objenesis',
+ 'name': 'sysroot_mips',
'pattern': '.',
- 'action': ['python',
- 'src/build/android/update_deps/update_third_party_deps.py',
- 'download',
- '-b', 'chromium-objenesis',
- '-l', 'third_party/objenesis'
- ],
+ 'condition': 'checkout_linux and checkout_mips',
+ 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+ '--arch=mips'],
},
{
- # Downloads the current stable linux sysroot to build/linux/ if needed.
- # This sysroot updates at about the same rate that the chrome build deps
- # change. This script is a no-op except for linux users who are doing
- # official chrome builds or cross compiling.
- 'name': 'sysroot',
+ 'name': 'sysroot_x64',
'pattern': '.',
+ 'condition': 'checkout_linux and checkout_x64',
'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
- '--running-as-hook'],
+ '--arch=x64'],
},
{
# Update the Windows toolchain if necessary.
@@ -297,6 +929,12 @@ hooks = [
'pattern': '.',
'action': ['python', 'src/build/vs_toolchain.py', 'update'],
},
+ {
+ # Update the Mac toolchain if necessary.
+ 'name': 'mac_toolchain',
+ 'pattern': '.',
+ 'action': ['python', 'src/build/mac_toolchain.py'],
+ },
# Pull binutils for linux, enabled debug fission for faster linking /
# debugging when used with clang on Ubuntu Precise.
# https://code.google.com/p/chromium/issues/detail?id=352046
@@ -313,7 +951,7 @@ hooks = [
# Note: On Win, this should run after win_toolchain, as it may use it.
'name': 'clang',
'pattern': '.',
- 'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'],
+ 'action': ['python', 'src/tools/clang/scripts/update.py'],
},
{
# Update LASTCHANGE.
@@ -425,10 +1063,29 @@ hooks = [
],
},
{
- 'name': 'clang_format_merge_driver',
+ # We used to use src as a CIPD root. We moved it to a different directory
+ # in crrev.com/c/930178 but left the clobber here to ensure that that CL
+ # could be reverted safely. This can be safely removed once crbug.com/794764
+ # is resolved.
+ 'name': 'Android Clobber Deprecated CIPD Root',
'pattern': '.',
- 'action': [ 'python',
- 'src/tools/clang_format_merge_driver/install_git_hook.py',
+ 'condition': 'checkout_android',
+ 'action': ['src/build/cipd/clobber_cipd_root.py',
+ '--root', 'src',
+ ],
+ },
+ # 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_sdk/public/extras directory.
+ 'name': 'sdkextras',
+ 'condition': 'checkout_android',
+ 'pattern': '.',
+ 'action': ['vpython',
+ 'src/build/android/play_services/update.py',
+ 'download'
],
},
]
@@ -436,6 +1093,4 @@ hooks = [
recursedeps = [
# buildtools provides clang_format, libc++, and libc++abi.
'src/buildtools',
- # android_tools manages the NDK.
- 'src/third_party/android_tools',
]