From a96d1dd0c8f6bbd684a5034094e7523f167f9339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Wed, 21 Feb 2018 22:24:34 +0100 Subject: [PATCH] Roll chromium_revision ff3b31782d..80f0c55706 (503850:536678) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manual changes: * Rewrite sysroot download (similar to https://webrtc-review.googlesource.com/c/50183/) * Do the same as https://webrtc-review.googlesource.com/c/21400/. * Add dep on findbugs for Android. Change log: https://chromium.googlesource.com/chromium/src/+log/ff3b31782d..80f0c55706 Full diff: https://chromium.googlesource.com/chromium/src/+/ff3b31782d..80f0c55706 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/9b543d487c..ac3d2b8118 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/156ba982d7..39738e75b2 * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/f6d165d9d8..a09e064635 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/39c4b2fcf7..299ef76e84 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/cc96d3d66b..5f7e36cad6 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/72c52c224c..2c0ced3ddb * src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/aadb2fed04..9a70d48fcd * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/aa736cc76e..e7298f36f7 * src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/7f8fefabed..0062e4869f * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/08cb956852..d888fd2a1b * src/third_party/robolectric/robolectric: https://chromium.googlesource.com/external/robolectric.git/+log/b02c65cc6d..7e067f1112 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/eceb2c420b..6202b67fc4 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/5e8001d9a7..88229872dd DEPS diff: https://chromium.googlesource.com/chromium/src/+/ff3b31782d..80f0c55706/DEPS Clang version changed 313786:324578 Details: https://chromium.googlesource.com/chromium/src/+/ff3b31782d..80f0c55706/tools/clang/scripts/update.py BUG=libyuv:768 Rewrite sysroot download Change-Id: Ie3cb0ba873c6c40877870b655ed299450726eac2 Reviewed-on: https://chromium-review.googlesource.com/918461 Reviewed-by: Frank Barchard Commit-Queue: Patrik Höglund --- .gn | 27 +----- DEPS | 292 ++++++++++++++++++----------------------------------------- 2 files changed, 90 insertions(+), 229 deletions(-) diff --git a/.gn b/.gn index 015d0f0e5..26a4a62d1 100644 --- a/.gn +++ b/.gn @@ -6,6 +6,8 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +import("//build/dotfile_settings.gni") + # The location of the build configuration file. buildconfig = "//build/config/BUILDCONFIG.gn" @@ -23,29 +25,8 @@ check_targets = [ "//libyuv/*" ] # These are the list of GN files that run exec_script. This whitelist exists # to force additional review for new uses of exec_script, which is strongly # discouraged except for gypi_to_gn calls. -exec_script_whitelist = [ - "//build/config/android/BUILD.gn", - "//build/config/android/config.gni", - "//build/config/android/internal_rules.gni", - "//build/config/android/rules.gni", - "//build/config/BUILD.gn", - "//build/config/compiler/BUILD.gn", - "//build/config/gcc/gcc_version.gni", - "//build/config/ios/ios_sdk.gni", - "//build/config/linux/BUILD.gn", - "//build/config/linux/pkg_config.gni", - "//build/config/mac/mac_sdk.gni", - "//build/config/posix/BUILD.gn", - "//build/config/sysroot.gni", - "//build/config/win/BUILD.gn", - "//build/config/win/visual_studio_version.gni", - "//build/gn_helpers.py", - "//build/gypi_to_gn.py", - "//build/toolchain/concurrent_links.gni", - "//build/toolchain/gcc_toolchain.gni", - "//build/toolchain/mac/BUILD.gn", - "//build/toolchain/win/BUILD.gn", -] +exec_script_whitelist = build_dotfile_settings.exec_script_whitelist + + [ "//build_overrides/build.gni" ] default_args = { mac_sdk_min = "10.11" diff --git a/DEPS b/DEPS index ccc701c4f..266327470 100644 --- a/DEPS +++ b/DEPS @@ -1,7 +1,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'ff3b31782d552b03104a6d831c7530605b52b13f', - 'swarming_revision': '5e8001d9a710121ce7a68efd0804430a34b4f9e4', + 'chromium_revision': '80f0c5570649c35a869429b2ab8c381a0a7246cb', + 'swarming_revision': '88229872dd17e71658fe96763feaa77915d8cbd6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. @@ -9,30 +9,30 @@ 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': 'aa736cc76ee5e35215abcfb83a8c354f12d0c684', + 'catapult_revision': 'e7298f36f7912f2caa122086cfbe71734d04b73f', } deps = { 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '156ba982d749902e3403c242e23ded87fd316494', + Var('chromium_git') + '/chromium/src/build' + '@' + '39738e75b27f39d4c0030a0b11d5d2ddd34715f7', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'f6d165d9d842ddd29056c127a5f3a3c5d8e0d2e3', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'a09e064635a49f08e585e3b173d5fbc3dd3f485e', 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + 'cc96d3d66b5b9613fd0fe055509cfec5eb54b19c', + Var('chromium_git') + '/chromium/src/testing' + '@' + '5f7e36cad6434fd3d65674af96653a23ecc9f694', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '72c52c224cdd3c377f7caff8ffed0f5749e79549', + Var('chromium_git') + '/chromium/src/third_party' + '@' + '2c0ced3ddbf84ce1c0759b277d9538da42f23650', 'src/third_party/catapult': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'), 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/googletest/src': - Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7f8fefabedf2965980585be8c2bff97458f28e0b', + Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '0062e4869f07a3ef235703ddf63af604b712446c', 'src/third_party/libjpeg_turbo': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'a1750dbc79a8792dde3d3f7d7d8ac28ba01ac9dd', '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' + '@' + 'eceb2c420b20350a2d2ba261953109280968647a', + Var('chromium_git') + '/chromium/src/tools' + '@' + '6202b67fc46a9984097caf237e12e3b8f7a9f7da', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -52,8 +52,16 @@ deps = { }, # Android deps: + 'src/third_party/auto/src': { + 'url': Var('chromium_git') + '/external/github.com/google/auto.git' + '@' + '8a81a858ae7b78a1aef71ac3905fade0bbd64e82', + 'condition': 'checkout_android', + }, + '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' + '@' + '9b543d487c7c38be191c6180001ff9ce186ae326', + 'url': Var('chromium_git') + '/chromium/src/base' + '@' + 'ac3d2b81181b085a9952cb83dba748420eefe691', 'condition': 'checkout_android', }, 'src/third_party/android_ndk': { @@ -61,17 +69,24 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'aadb2fed04af8606545b0afe4e3060bc1a15fad7', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + '9a70d48fcdd68cd0e7e968f342bd767ee6323bd1', 'condition': 'checkout_android', }, 'src/third_party/ced/src': { 'url': Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9', 'condition': 'checkout_android', }, - 'src/third_party/icu': { - 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '08cb956852a5ccdba7f9c941728bb833529ba3c6', + 'src/third_party/errorprone/lib': { + 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + 'ecc57c2b00627667874744b9ad8efe10734d97a8', + 'condition': 'checkout_android', + }, + 'src/third_party/findbugs': { + 'url': Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '4275d9ac8610db6b1bc9a5e887f97e41b33fac67', 'condition': 'checkout_android', }, + 'src/third_party/icu': { + 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd888fd2a1be890f4d35e43f68d6d79f42519a357', + }, 'src/third_party/jsr-305/src': { 'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919', 'condition': 'checkout_android', @@ -89,7 +104,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/robolectric/robolectric': { - 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + 'b02c65cc6d7465f58f0de48a39914aa905692afa', + 'url': Var('chromium_git') + '/external/robolectric.git' + '@' + '7e067f1112e1502caa742f7be72d37b5678d3403', 'condition': 'checkout_android', }, 'src/third_party/ub-uiautomator/lib': { @@ -99,7 +114,7 @@ deps = { # iOS deps: 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '39c4b2fcf73f5b1e82af3b9c57267c17217d6a30', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '299ef76e844a74a1f2f4ce7f06d101861fb49aba', 'condition': 'checkout_ios' }, @@ -140,200 +155,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. + # Downloads the current stable linux sysroot to build/linux/ if needed. { - # 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' - ], - }, - { - 'name': 'apache_velocity', - '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': 'desugar', - 'pattern': '.', - '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': '.', - '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' - ], - }, - { - 'name': 'bouncycastle', - 'pattern': '.', - 'action': ['python', - 'src/build/android/update_deps/update_third_party_deps.py', - 'download', - '-b', 'chromium-bouncycastle', - '-l', 'third_party/bouncycastle' - ], - }, - { - 'name': 'sqlite4java', - 'pattern': '.', - 'action': ['python', - 'src/build/android/update_deps/update_third_party_deps.py', - 'download', - '-b', 'chromium-sqlite4java', - '-l', 'third_party/sqlite4java' - ], - }, - { - 'name': 'xstream', - 'pattern': '.', - 'action': ['python', - 'src/build/android/update_deps/update_third_party_deps.py', - 'download', - '-b', 'chromium-robolectric', - '-l', 'third_party/xstream' - ], - }, - { - 'name': 'objenesis', - 'pattern': '.', - 'action': ['python', - 'src/build/android/update_deps/update_third_party_deps.py', - 'download', - '-b', 'chromium-objenesis', - '-l', 'third_party/objenesis' - ], - }, - { - # 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_arm', 'pattern': '.', + 'condition': 'checkout_linux and checkout_arm', 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', - '--running-as-hook'], + '--arch=arm'], + }, + { + 'name': 'sysroot_arm64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_arm64', + 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=arm64'], + }, + { + 'name': 'sysroot_x86', + 'pattern': '.', + 'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', + 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=x86'], + }, + { + 'name': 'sysroot_mips', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_mips', + 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=mips'], + }, + { + 'name': 'sysroot_x64', + 'pattern': '.', + 'condition': 'checkout_linux and checkout_x64', + 'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py', + '--arch=x64'], }, { # Update the Windows toolchain if necessary. @@ -468,6 +324,30 @@ hooks = [ '-d', 'src/tools/luci-go/linux64', ], }, + { + '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', + ], + }, + # 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' + ], + }, ] recursedeps = [