diff options
| author | mark a. foltz <mfoltz@chromium.org> | 2019-10-10 15:36:15 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-10 22:45:39 +0000 |
| commit | 59ee9c8862968b8d5b49a1d43cbe4a86218b52b2 (patch) | |
| tree | 6a89be32b66750a4bec4ddf5e5e643c06a79ff94 | |
| parent | af60f62955c6101bbc4223f30e7685a824369058 (diff) | |
| download | openscreen-59ee9c8862968b8d5b49a1d43cbe4a86218b52b2.tar.gz | |
Use recursive deps for buildtools/.
This allows us to pull in the clang-format scripts from upstream, which are used by
git cl format.
It also allows us to pull in the current SHA1 for clang-format, instead of querying
the clang-format repo directly.
Change-Id: I84e78030af9387a46bf4145c6314753fbf3f5b71
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1846457
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Jordan Bayles <jophba@chromium.org>
| -rw-r--r-- | DEPS | 23 | ||||
| -rwxr-xr-x | tools/install-build-tools.sh | 3 |
2 files changed, 2 insertions, 24 deletions
@@ -41,28 +41,6 @@ deps = { 'condition': 'not build_with_chromium', }, - 'buildtools/linux64': { - 'packages': [ - { - 'package': 'gn/gn/linux-amd64', - 'version': Var('gn_version'), - }, - ], - 'dep_type': 'cipd', - 'condition': 'checkout_linux', - }, - - 'buildtools/mac': { - 'packages': [ - { - 'package': 'gn/gn/mac-amd64', - 'version': Var('gn_version'), - }, - ], - 'dep_type': 'cipd', - 'condition': 'checkout_mac', - }, - 'third_party/protobuf/src': { 'url': Var('chromium_git') + '/external/github.com/protocolbuffers/protobuf.git' + @@ -123,6 +101,7 @@ deps = { recursedeps = [ 'third_party/chromium_quic/src', + 'buildtools', ] include_rules = [ diff --git a/tools/install-build-tools.sh b/tools/install-build-tools.sh index b9256761..65fb4643 100755 --- a/tools/install-build-tools.sh +++ b/tools/install-build-tools.sh @@ -18,7 +18,6 @@ case "$env" in mac) ninja_zipfile="ninja-mac.zip";; esac -BUILDTOOLS_REPO_URL="https://chromium.googlesource.com/chromium/src/buildtools" GOOGLE_STORAGE_URL="https://storage.googleapis.com" BUILDTOOLS_ROOT=$(git rev-parse --show-toplevel)/buildtools/$env if [ ! -d $BUILDTOOLS_ROOT ]; then @@ -27,7 +26,7 @@ fi pushd $BUILDTOOLS_ROOT set -x # echo on -sha1=$(curl "$BUILDTOOLS_REPO_URL/+/master/$env/clang-format.sha1?format=TEXT" | base64 --decode) +sha1=$(tail -c+1 $BUILDTOOLS_ROOT/clang-format.sha1) curl -Lo clang-format "$GOOGLE_STORAGE_URL/chromium-clang-format/$sha1" chmod +x clang-format curl -L "https://github.com/ninja-build/ninja/releases/download/${ninja_version}/${ninja_zipfile}" | funzip > ninja |