From 28c3571ed0138954514028b4bc05fe05508ffcc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Thu, 7 Dec 2017 10:05:08 +0100 Subject: [PATCH] Roll chromium_revision 5d9089080e..fb396f70fd (522183:522378) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to java8_dist_jar unblock the roll. Change log: https://chromium.googlesource.com/chromium/src/+log/5d9089080e..fb396f70fd Full diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/ea8d608e8e..028bc777a2 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/379d3331d1..a487899ea8 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/7796ebdb5c..277bfb566d * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/50b6577a3d..7c055df753 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/caec3c432a..d8cd44fcb7 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/307c9f954d..db654910e3 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c98f4e3e61..a626dcf509 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/6fd3c7b6eb..4bd9152f8a DEPS diff: https://chromium.googlesource.com/chromium/src/+/5d9089080e..fb396f70fd/DEPS No update to Clang. TBR=buildbot@webrtc.org, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: I0cae8d49c169f77c63ef85eb1ca9d4a5898bbbc4 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/30680 Commit-Queue: Mirko Bonadei Reviewed-by: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#21161} --- DEPS | 18 +++++++++--------- sdk/android/BUILD.gn | 7 +++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index 6a6155ce57..a64a063b56 100644 --- a/DEPS +++ b/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': '5d9089080ea5fb0e348bb28f7a396d1181476f0f', + 'chromium_revision': 'fb396f70fdafd36e61eeea88bb174caa95fd8513', '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': '6fd3c7b6eb7c60f89e83f8ab1f93c133488f984e', + 'swarming_revision': '4bd9152f8a975d57c972c071dfb4ddf668e02200', # 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. @@ -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': '307c9f954dc52f4bbce5b8a5e9ce40ff2ac0451d', + 'catapult_revision': 'db654910e39e4d8866a4eaf93167a24a41ceacdf', # 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,9 +38,9 @@ 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' + '@' + 'ea8d608e8e4f09bd6196bdcc620eabf907ab86c0', + Var('chromium_git') + '/chromium/src/base' + '@' + '028bc777a255b2949e8aa64b5560977faa710c6e', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '379d3331d14d0526bb3c2176d0a57cd7263d1c7b', + Var('chromium_git') + '/chromium/src/build' + '@' + 'a487899ea8aec4dfcab1d9e8d5bc4619792ad060', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '282996b8c3cf7f05bbb5209432e9fe8162c6e7ac', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -50,13 +50,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '7796ebdb5c5df326047654a341cf0b795ec9d740', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '277bfb566dd0e0b0083edfaa6fd4f7ad1283a7a1', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '50b6577a3da90c6215fec409e5c74178cde1c686', + Var('chromium_git') + '/chromium/src/testing' + '@' + '7c055df7539b01f32f9fec922477de0f3a554844', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + 'caec3c432a8f598cec1809db460c6ab5e6ee23f9', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'd8cd44fcb75ce70ec7833c5c21dcd409caa1ab38', 'src/third_party/android_tools': { 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'a2e9bc7c1b41d983577907df51d339fb1e0fd02f', 'condition': 'checkout_android', @@ -155,7 +155,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' + '@' + 'c98f4e3e6108a67a46b339d16e2ec939010af5b3', + Var('chromium_git') + '/chromium/src/tools' + '@' + 'a626dcf509d6a1b62f735520c22c18abe5a5bbca', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 6b099c413a..2f024c7afe 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -468,11 +468,10 @@ template("java8_dist_jar") { _output_jars = [] foreach(dep, invoker.deps) { _dep_name = get_label_info(dep, "name") - _source_jar = get_label_info(dep, "target_gen_dir") + "/" + _dep_name + - "__compile_java.javac.jar" + _source_jar = + get_label_info(dep, "target_gen_dir") + "/" + _dep_name + ".javac.jar" _output_jar = "$target_gen_dir/" + _dep_name + ".jar" - _copy_dep = dep + "__compile_java__javac" _copy_target_name = "${target_name}_${_dep_name}_copy" copy(_copy_target_name) { @@ -483,7 +482,7 @@ template("java8_dist_jar") { _output_jar, ] deps = [ - _copy_dep, + dep, ] } _deps += [ ":" + _copy_target_name ]