From dfc0843e5c9e6a21ce20fb168d6c58950e2573e4 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 21 Dec 2017 07:37:15 +0000 Subject: Roll DEPS for build to 3d168649. https://chromium.googlesource.com/chromium/src/build/+log/92d3b8cf..3d168649 Also pull in binutils on Linux, so Android builds can continue working after upgrading the sysroot to Debian Stretch. TBR=thomasanderson@chromium.org Change-Id: I7d08e51ca903ac7fdcdcb971202ec5f3f573f73f Reviewed-on: https://pdfium-review.googlesource.com/21370 Reviewed-by: Lei Zhang Commit-Queue: Lei Zhang --- .gitignore | 1 + DEPS | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9611bcebf6..beeb3cd9f0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /testing/gmock /testing/gtest /third_party/android_ndk +/third_party/binutils /third_party/catapult /third_party/freetype/src /third_party/icu diff --git a/DEPS b/DEPS index 0c8f7c5e36..3571ed2111 100644 --- a/DEPS +++ b/DEPS @@ -5,7 +5,8 @@ vars = { 'pdfium_git': 'https://pdfium.googlesource.com', 'android_ndk_revision': 'd57523210239b867fa4fb9d05c2aacc3f1802fe0', - 'build_revision': '92d3b8cfce9c0fc49847e783546ad3b01504aba4', + 'binutils_revision': 'e146228c20af6af922887d0be2d3641cbffb33c5', + 'build_revision': '3d1686497c66b711f35b5c58994c08d95e8aff4b', 'buildtools_revision': 'f6d165d9d842ddd29056c127a5f3a3c5d8e0d2e3', 'catapult_revision': 'd624b3ced2c81d4fb4ea98a8dbb4532272cc1e0a', 'clang_revision': '8427dae2b5a769314af722e09000563b5184ba06', @@ -48,6 +49,10 @@ deps = { "testing/gtest": Var('chromium_git') + "/external/googletest.git@" + Var('gtest_revision'), + "third_party/binutils": + Var('chromium_git') + "/chromium/src/third_party/binutils.git@" + + Var('binutils_revision'), + "third_party/freetype/src": Var('chromium_git') + '/chromium/src/third_party/freetype2.git@' + Var('freetype_revision'), @@ -208,6 +213,15 @@ hooks = [ 'pdfium/tools/clang/scripts/update.py' ], }, + { + 'name': 'binutils', + 'pattern': 'src/third_party/binutils', + 'condition': 'host_os == "linux"', + 'action': [ + 'python', + 'pdfium/third_party/binutils/download.py', + ], + }, { # Downloads the current stable linux sysroot to build/linux/ if needed. # This sysroot updates at about the same rate that the chrome build deps @@ -236,5 +250,4 @@ hooks = [ 'pattern': '\\.sha1', 'action': ['python', 'pdfium/third_party/instrumented_libraries/scripts/download_binaries.py'], }, - ] -- cgit v1.2.3