diff --git a/DEPS b/DEPS index 5edac1832f..f9b1565943 100644 --- a/DEPS +++ b/DEPS @@ -5,16 +5,16 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '5e84fd25150053e7d9c5a0ef7b349ba460d9b878', + 'chromium_revision': 'd74690feb17093e8711c8633d9a45fe436060d0c', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@8c4b9fc6d4e30d0aad14372a9c93c74fa459b52f', + 'https://chromium.googlesource.com/chromium/src/base@0f64a756c5fcc369911fbfd0e3f11c293dc35a98', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@fb91e5b693cfd8f4a457ea4cf4fab13e05d85ac8', + 'https://chromium.googlesource.com/chromium/src/build@b3e93c048220a37dd6699a9636064dcef4532e2e', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@74cfb57006f83cfe050817526db359d5c8a11628', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -23,13 +23,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@e0c65f1b8abfe3af55e8f151c64e7ac55c18211e', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@48037d2833abec40ad16bc349e474ff02ec8fecc', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@47728d0c1d1f3e21076ecea96d2333d2ff597006', + 'https://chromium.googlesource.com/chromium/src/testing@7b91b663fc4c83a6e82e65590a7539049f0bcd3e', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@a52ef709ddf9176c901f6565f11368ffd0f98643', + 'https://chromium.googlesource.com/chromium/src/third_party@8bc6decc0be6238434c624a55934f7a9e6a53591', 'src/buildtools/linux64': { 'packages': [ @@ -119,7 +119,7 @@ deps = { 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@355e97e300e8baceae8353287ad59b915dbb8196', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@1db68ea0ba175a62889d15dc420c4bd481db2513', 'src/third_party/errorprone/lib': { 'url': 'https://chromium.googlesource.com/chromium/third_party/errorprone.git@980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', @@ -131,7 +131,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@543a3b939df50e02e52b948f4c9c8ba63bf38059', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@3fa35aa420ee88856c60d3c0b7fedd43801953cc', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@bbad1b8298125d78c159ed7fdd7bde6a3f3fff56', # WebRTC-only dependency (not present in Chromium). @@ -231,7 +231,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@d4b258f2dbb2a2b5f620c6e5b01d1bd46030725e', + 'https://chromium.googlesource.com/chromium/src/tools@347ed0a547cf9c17875b30b61a9eeee9cf1f4203', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@96f125709acfd0b48fc1e5dae7d6ea42291726ac', @@ -612,6 +612,248 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_appcompat_appcompat': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_appcompat_appcompat', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_arch_core_core_common': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_common', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_arch_core_core_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_arch_core_core_runtime', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_asynclayoutinflater_asynclayoutinflater': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_asynclayoutinflater_asynclayoutinflater', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_cardview_cardview': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_cardview_cardview', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_collection_collection': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_collection_collection', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_coordinatorlayout_coordinatorlayout', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_core_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_core_core', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_cursoradapter_cursoradapter': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_cursoradapter_cursoradapter', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_customview_customview': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_customview_customview', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_documentfile_documentfile': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_documentfile_documentfile', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_drawerlayout_drawerlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_drawerlayout_drawerlayout', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_fragment_fragment': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_fragment_fragment', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_gridlayout_gridlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_gridlayout_gridlayout', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_interpolator_interpolator': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_interpolator_interpolator', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_leanback_leanback': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_leanback_leanback_preference': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback_preference', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_core_ui': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_core_ui', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_core_utils': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_core_utils', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v13': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v13', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_legacy_legacy_support_v4': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_support_v4', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common': { 'packages': [ { @@ -623,6 +865,182 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_loader_loader': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_loader_loader', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_localbroadcastmanager_localbroadcastmanager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_localbroadcastmanager_localbroadcastmanager', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_media_media': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_media_media', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_mediarouter_mediarouter': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_mediarouter_mediarouter', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_multidex_multidex': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_multidex_multidex', + 'version': 'version:2.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_palette_palette': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_palette_palette', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_preference_preference': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_preference_preference', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_print_print': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_print_print', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_recyclerview_recyclerview': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_recyclerview_recyclerview', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_slidingpanelayout_slidingpanelayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_slidingpanelayout_slidingpanelayout', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_swiperefreshlayout_swiperefreshlayout': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_swiperefreshlayout_swiperefreshlayout', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/androidx_test_core': { 'packages': [ { @@ -678,6 +1096,61 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_transition_transition': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_transition_transition', + 'version': 'version:1.0.0-rc02-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable_animated': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_vectordrawable_vectordrawable_animated', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_versionedparcelable_versionedparcelable': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_versionedparcelable_versionedparcelable', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_viewpager_viewpager': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_viewpager_viewpager', + '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': [ { @@ -1316,6 +1789,17 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/com_google_android_material_material': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/com_google_android_material_material', + 'version': 'version:1.0.0-rc02-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/com_google_code_findbugs_jsr305': { 'packages': [ {