From 1e53f8ad040ad8e614c0d1205cff070a8a03bf44 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Thu, 21 Dec 2017 22:06:21 +0100 Subject: [PATCH] Roll chromium_revision 747cb1afa7..a3e55aafc0 (525640:525714) + Android fix Adapt Android build rule usages according to upstream change https://chromium-review.googlesource.com/c/chromium/src/+/833158 Change log: https://chromium.googlesource.com/chromium/src/+log/747cb1afa7..a3e55aafc0 Full diff: https://chromium.googlesource.com/chromium/src/+/747cb1afa7..a3e55aafc0 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/37d45f196a..058c173308 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5e68daf0b2..86d9760b0c * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/a1e00fa91e..34051b405b * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/f514237b80..f471a14790 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/4ff31643cf..2ce24f00db * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/a0b20a4892..436908b7d2 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/753234bdb4..0b61011efa DEPS diff: https://chromium.googlesource.com/chromium/src/+/747cb1afa7..a3e55aafc0/DEPS Clang version changed 318667:321204 Details: https://chromium.googlesource.com/chromium/src/+/747cb1afa7..a3e55aafc0/tools/clang/scripts/update.py TBR=sakal@webrtc.org BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: I086df695fb2f279bfe49d539acfaf13e43559167 Reviewed-on: https://webrtc-review.googlesource.com/35940 Commit-Queue: Oleh Prypin Reviewed-by: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#21422} --- DEPS | 16 ++++++++-------- examples/BUILD.gn | 1 + sdk/android/BUILD.gn | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index c120137430..acc54e8dc2 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': '747cb1afa7ec0b160837f87626161d29f97063af', + 'chromium_revision': 'a3e55aafc0dc0019ed20c1636311c30eb6290396', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client @@ -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': 'a0b20a4892e20dcd620ac6f821411fa62ee3994b', + 'catapult_revision': '436908b7d264b36cf00478756f59f109e93e31a5', # 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' + '@' + '37d45f196a365457b8892de6800899cd076baf40', + Var('chromium_git') + '/chromium/src/base' + '@' + '058c173308f1c0b3283986e02c258dca1ffaa8e5', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '5e68daf0b206ecdd6af92a9af14a855f7982740b', + Var('chromium_git') + '/chromium/src/build' + '@' + '86d9760b0cb035f2d4f32fa9213d909d76cb891d', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + '1be57dc4c2c68fa564ee258a3af0cf8003007edf', # 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' + '@' + 'a1e00fa91edb68e0b7b8de8ccca3a14700e6231d', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '34051b405b9bb7287a96d3766bc9765945f068ac', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + 'f514237b8073309d8886e8ac0c82a5e27b64fa9d', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'f471a14790c68cea3b9b7298a4ee32fb50c5ff8d', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '4ff31643cf6b4b413748372f5b67c359e63b3dda', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '2ce24f00db5e99bc8f227584fc2355987721698f', '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' + '@' + '753234bdb464bc486d2f12ac8422d8d96dea9ffd', + Var('chromium_git') + '/chromium/src/tools' + '@' + '0b61011efa1514688cf3510aeeac9d2319b1affb', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 82b99c1cf7..7ae56f91e3 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -702,6 +702,7 @@ if (is_android) { output = "${root_out_dir}/lib.java${_target_dir_name}/${target_name}.jar" direct_deps_only = true use_interface_jars = false + use_unprocessed_jars = true requires_android = true deps = [ ":webrtc_unity_java", diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn index 1e98755845..5e46b2a963 100644 --- a/sdk/android/BUILD.gn +++ b/sdk/android/BUILD.gn @@ -562,7 +562,7 @@ template("java8_dist_jar") { foreach(output_jar, _output_jars) { args += [ - "--inputs", + "--jars", rebase_path(output_jar, root_build_dir), ] }