aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormark a. foltz <mfoltz@chromium.org>2021-06-01 15:54:50 -0700
committerOpenscreen LUCI CQ <openscreen-scoped@luci-project-accounts.iam.gserviceaccount.com>2021-06-01 23:44:45 +0000
commitdec3ae516ec228e649869988229b0e48ee8bc269 (patch)
tree0fd4d5dbe4783d75857f4af5a05cf43639ebd82b
parentcacde3327295076c1e93d772ca38b115cf93bbd4 (diff)
downloadopenscreen-dec3ae516ec228e649869988229b0e48ee8bc269.tar.gz
[openscreen] Fix some DEPS and PRESUBMIT issues.
1. We weren't checking out the clang-format-diff script, which is used by git-cl. 2. buildtools/ should only be checked out when build_with_chromium=False. 3. The license checker is complaining about buildtools/third_party. Exclude that path until it can be fixed. TBR=btolsch@chromium.org Change-Id: Ibf8d0d989b0d9c1f43016950a9ac87f2b006afbb Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2928929 Reviewed-by: mark a. foltz <mfoltz@chromium.org> Commit-Queue: mark a. foltz <mfoltz@chromium.org>
-rw-r--r--DEPS11
-rwxr-xr-xPRESUBMIT.py3
2 files changed, 12 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index b59a5492..ccd17caf 100644
--- a/DEPS
+++ b/DEPS
@@ -32,6 +32,7 @@ vars = {
# GN CIPD package version.
'gn_version': 'git_revision:39a87c0b36310bdf06b692c098f199a0d97fc810',
+ 'clang_format_revision': '99803d74e35962f63a775f29477882afd4d57d94',
}
deps = {
@@ -45,6 +46,12 @@ deps = {
'@' + 'fba2905150c974240f14aa5334c3e5c93f873032',
'condition': 'not build_with_chromium',
},
+ 'buildtools/clang_format/script': {
+ 'url': Var('chromium_git') +
+ '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' +
+ '@' + Var('clang_format_revision'),
+ 'condition': 'not build_with_chromium',
+ },
'buildtools/linux64': {
'packages': [
{
@@ -53,7 +60,7 @@ deps = {
}
],
'dep_type': 'cipd',
- 'condition': 'host_os == "linux"',
+ 'condition': 'host_os == "linux" and not build_with_chromium',
},
'buildtools/mac': {
'packages': [
@@ -63,7 +70,7 @@ deps = {
}
],
'dep_type': 'cipd',
- 'condition': 'host_os == "mac"',
+ 'condition': 'host_os == "mac" and not build_with_chromium',
},
'third_party/protobuf/src': {
'url': Var('chromium_git') +
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index f8a427d7..a07514dc 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -199,6 +199,9 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckDeps(input_api, output_api))
# Run tools/licenses on code change.
+ # TODO(https://crbug.com/1215335): licenses check is confused by our
+ # buildtools checkout that doesn't actually check out the libraries.
+ licenses.PRUNE_PATHS.add(os.path.join('buildtools', 'third_party'));
results.extend(_CheckLicenses(input_api, output_api))
return results