Merge Android 14 QPR3 to AOSP mainHEADmastermain

Bug: 346855327
Merged-In: I53c31bf235995c42bec9ba543f5b61b71aa9ae71
Change-Id: I6d553c1ab9fa403c4f6f3a1e5b8256fcdbc90589

4 files changed, 11 insertions, 15 deletions

diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index 3090588..0a544d6 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -116,11 +116,11 @@ def is_git_toplevel(git, directory):
 
 
 def status(directory, checkoutable):
-  def truncate(s, length):
-    return s if len(s) <= length else s[:(length - 3)] + '...'
+  def tail_truncate(s, length):
+    return s if len(s) <= length else '...' + s[-(length - 3):]
   dlen = 36
-  directory = truncate(directory, dlen)
-  checkoutable = truncate(checkoutable, 40)
+  directory = tail_truncate(directory, dlen)
+  checkoutable = tail_truncate(checkoutable, 40)
   sys.stdout.write('%-*s @ %s\n' % (dlen, directory, checkoutable))
 
 
diff --git a/tools/roll-all b/tools/roll-all
index 48557e8..c74023d 100755
--- a/tools/roll-all
+++ b/tools/roll-all
@@ -14,19 +14,14 @@
 # limitations under the License.
 
 # Defined to use origin/master instead of origin/main
-clspv=1
+# TODO(https://github.com/google/amber/issues/1014): Khronos repos are switching
+# to main
 cpplint=1
 dxc=1
-glslang=1
 googletest=1
 json=1
 lodepng=1
-spirv_headers=1
-spirv_tools=1
 swiftshader=1
-vulkan_loader=1
-vulkan_validationlayers=1
-
 
 # This script assumes it's parent directory is the repo root.
 repo_path=$(dirname "$0")/..
diff --git a/tools/run-lint.sh b/tools/run-lint.sh
index 40bc8a7..3fbaf93 100755
--- a/tools/run-lint.sh
+++ b/tools/run-lint.sh
@@ -15,5 +15,6 @@
 
 set -e  # fail on error
 
-./third_party/cpplint/cpplint/cpplint.py `find src samples -type f`
-./third_party/cpplint/cpplint/cpplint.py --root include `find ./include -type f`
+FILTERS=-build/header_guard
+./third_party/cpplint/cpplint.py  --filter "$FILTERS" `find src samples -type f`
+./third_party/cpplint/cpplint.py  --filter "$FILTERS" --root include `find ./include -type f`
diff --git a/tools/update_build_version.py b/tools/update_build_version.py
index 9feafb1..c3fad97 100755
--- a/tools/update_build_version.py
+++ b/tools/update_build_version.py
@@ -35,9 +35,9 @@ def command_output(cmd, directory):
                        cwd=directory,
                        stdout=subprocess.PIPE,
                        stderr=subprocess.PIPE)
-  (stdout, _) = p.communicate()
+  (stdout, stderr) = p.communicate()
   if p.returncode != 0:
-    raise RuntimeError('Failed to run {} in {}'.format(cmd, directory))
+    raise RuntimeError('Failed to run {} in {}\nstdout: {}\nstderr: {}'.format(cmd, directory, stdout, stderr))
   return stdout