Roll chromium_revision f93b8b19f2..adf969a7cb (513366:514871) and more.
MORE: ----- * Get rid of canary in gradle_project_test. This follows http://crrev.com/a959a6cf * Switch Android binary deps to be managed by CIPD. This mirrors http://crrev.com/b80cf484 CHROMIUM ROLL: -------------- Change log:f93b8b19f2..adf969a7cbFull diff:f93b8b19f2..adf969a7cbChanged dependencies: * src/base:eec763edae..a7b41d733d* src/build:4ef2624fab..f157e447ed* src/buildtools:3275a099f3..73ddd64be6* src/ios:9e4709d134..4aa21e3299* src/testing:a8c077a658..fc66e396f9* src/third_party:3bd34f929d..7b30c21c2c* src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/ca0bd08387..4a9623af57 * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/664e99a648..6cc352e216 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/14715602e0..af046c52f1 * src/third_party/depot_tools:70dea4270e..c4ccb4b623* src/third_party/ffmpeg:f9e8b42758..c33a5ee8e7* src/third_party/icu:21d33b1a09..b31896655a* src/tools:b512b7250b..29a3411140* src/tools/swarming_client:5da404cf35..6fd3c7b6ebDEPS diff:f93b8b19f2..adf969a7cb/DEPS Clang version changed 315613:317263 Details:f93b8b19f2..adf969a7cb/tools/clang/scripts/update.py TBR=phoglund@webrtc.org, sakal@webrtc.org CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Bug: webrtc:8501 Change-Id: I28b0e78748e2441247d7d3b7976eec957ac47726 Reviewed-on: https://webrtc-review.googlesource.com/21400 Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org> Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20603}
This commit is contained in:
Edward Lemur
Commit Bot
parent
84a87c4575
commit
82752c4d25
1
.gitignore
vendored
1
.gitignore
vendored
@ -26,6 +26,7 @@
|
||||
*_proto_cpp.xml
|
||||
*~
|
||||
.*.sw?
|
||||
.cipd
|
||||
.classpath
|
||||
.cproject
|
||||
.gdb_history
|
||||
|
||||
226
DEPS
226
DEPS
@ -7,12 +7,12 @@ vars = {
|
||||
'checkout_configuration': 'default',
|
||||
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
|
||||
'webrtc_git': 'https://webrtc.googlesource.com',
|
||||
'chromium_revision': 'f93b8b19f23d32a7b651cc560efaab18c18c1f10',
|
||||
'chromium_revision': 'adf969a7cb9ee663fe7083f0f94faa05d81d2e0d',
|
||||
'boringssl_git': 'https://boringssl.googlesource.com',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling swarming_client
|
||||
# and whatever else without interference from each other.
|
||||
'swarming_revision': '5da404cf35b6541f16d8bd6cc3e506df1fda8021',
|
||||
'swarming_revision': '6fd3c7b6eb7c60f89e83f8ab1f93c133488f984e',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling openmax_dl
|
||||
# and whatever else without interference from each other.
|
||||
@ -20,7 +20,7 @@ vars = {
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling BoringSSL
|
||||
# and whatever else without interference from each other.
|
||||
'boringssl_revision': '664e99a6486c293728097c661332f92bf2d847c6',
|
||||
'boringssl_revision': '6cc352e216938d78b65fb8ccbeebfc1f7f7486c4',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling lss
|
||||
# and whatever else without interference from each other.
|
||||
@ -28,7 +28,7 @@ vars = {
|
||||
# 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': '14715602e04a3a6e6cf79342f45d2f2595cce0f4',
|
||||
'catapult_revision': 'af046c52f16840247004247b8063c61dcaef410b',
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling libFuzzer
|
||||
# and whatever else without interference from each other.
|
||||
@ -38,11 +38,11 @@ deps = {
|
||||
# TODO(kjellander): Move this to be Android-only once the libevent dependency
|
||||
# in base/third_party/libevent is solved.
|
||||
'src/base':
|
||||
Var('chromium_git') + '/chromium/src/base' + '@' + 'eec763edae535000b2905891959c8385694d5fa2',
|
||||
Var('chromium_git') + '/chromium/src/base' + '@' + 'a7b41d733d26fc48c971fc5deb873e93cf2277b6',
|
||||
'src/build':
|
||||
Var('chromium_git') + '/chromium/src/build' + '@' + '4ef2624fabe9710231174fd89faa354edd7456db',
|
||||
Var('chromium_git') + '/chromium/src/build' + '@' + 'f157e447ed409cbf6c93b5d7ce0eb741dec8acc6',
|
||||
'src/buildtools':
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '3275a099f3c199b50ff97117aa0184f3e91f8a32',
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '73ddd64be624a6f935f312a72d2da7f0ed70daa5',
|
||||
# Gradle 4.3-rc4. 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' + '@' +
|
||||
@ -50,15 +50,15 @@ deps = {
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/ios': {
|
||||
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '9e4709d13410dfa655f5dc90c799047ee89eb6eb',
|
||||
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '4aa21e3299e9e5ee55314082d0fc81399a004d18',
|
||||
'condition': 'checkout_ios',
|
||||
},
|
||||
'src/testing':
|
||||
Var('chromium_git') + '/chromium/src/testing' + '@' + 'a8c077a65849987da1f01def609e25f69e08a536',
|
||||
Var('chromium_git') + '/chromium/src/testing' + '@' + 'fc66e396f95f80ecb003f5be344391738d3176b9',
|
||||
'src/third_party':
|
||||
Var('chromium_git') + '/chromium/src/third_party' + '@' + '3bd34f929dc1e51ced7602744d1baedd182484f9',
|
||||
Var('chromium_git') + '/chromium/src/third_party' + '@' + '7b30c21c2cecd93b6952dc0647d30a5aaa361d9b',
|
||||
'src/third_party/android_tools': {
|
||||
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca0bd083872ad925881736fe2bedc3ff855e08f5',
|
||||
'url': Var('chromium_git') + '/android_tools.git' + '@' + '4a9623af577555a8dab891c8789cc3dfe80addae',
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/third_party/auto/src': {
|
||||
@ -76,20 +76,20 @@ deps = {
|
||||
'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' + '@' + '70dea4270ec17be5af9f04492d3ba15f58df4501',
|
||||
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'c4ccb4b623c91fb2a38e365db5c307523c1ec05c',
|
||||
'src/third_party/errorprone/lib': {
|
||||
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '16b8b7298b183312a2fcac99fb1b594ccf7749d0',
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
'src/third_party/ffmpeg':
|
||||
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'f9e8b4275837a3859988351b70d5d1e045838da8',
|
||||
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'c33a5ee8e7b013b43e7fa9e0224857abc21564c2',
|
||||
# WebRTC-only dependency (not present in Chromium).
|
||||
'src/third_party/gtest-parallel':
|
||||
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '89ab65d56d3c76e552f59adabbaf8b0cf80d55ea',
|
||||
'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' + '@' + '21d33b1a09a77f033478ea4ffffb61e6970f83bd',
|
||||
'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'b31896655a701874d13e70cc24bca95e3e66a991',
|
||||
},
|
||||
'src/third_party/jsr-305/src': {
|
||||
'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
|
||||
@ -151,7 +151,7 @@ deps = {
|
||||
'src/third_party/yasm/source/patched-yasm':
|
||||
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
|
||||
'src/tools':
|
||||
Var('chromium_git') + '/chromium/src/tools' + '@' + 'b512b7250b8c8d7b1f66fe2dd39557be246417a5',
|
||||
Var('chromium_git') + '/chromium/src/tools' + '@' + '29a3411140d348972a19396e4572de4a28bffc53',
|
||||
'src/tools/gyp':
|
||||
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
|
||||
'src/tools/swarming_client':
|
||||
@ -432,6 +432,15 @@ 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.
|
||||
@ -445,193 +454,6 @@ hooks = [
|
||||
'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'
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
recursedeps = [
|
||||
|
||||
@ -67,7 +67,7 @@ def main():
|
||||
_RunCommand([GENERATE_GRADLE_SCRIPT, '--output-directory', output_dir,
|
||||
'--target', '//examples:AppRTCMobile',
|
||||
'--project-dir', project_dir,
|
||||
'--use-gradle-process-resources', '--split-projects', '--canary'],
|
||||
'--use-gradle-process-resources', '--split-projects'],
|
||||
env=env)
|
||||
_RunCommand([GRADLEW_BIN, 'assembleDebug'], project_dir)
|
||||
finally:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user