AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use android ndk r25 (#5309)

Browse Source 
* Use android ndk r25

We currently use R21 of the Android NDK for our tests. There have been
to LTS release since that one, and we do not expect people to use it
anymore. Also, it contains Python 2.7, not Python3. The python scripts
in SPIR-V Tools expect Python 3, so we have to update.

We chose the latest LTS release.

* Roll external/googletest/ be03d00f5..4a1a299b2 (1 commit)

be03d00f5f...4a1a299b20

$ git log be03d00f5..4a1a299b2 --date=short --no-merges --format='%ad %ae %s'
2023-07-07 absl-team Update docstring of PrintWithFallback(..) to reflect the recently changed ordering.

Created with:
  roll-dep external/googletest

* Roll external/re2/ 1c1ffbe3c..a57a1d646 (2 commits)

1c1ffbe3c6...a57a1d6462

$ git log 1c1ffbe3c..a57a1d646 --date=short --no-merges --format='%ad %ae %s'
2023-07-06 junyer Stop using `std::map<std::string, Prefilter*>`.
2023-07-06 junyer Bump the CMake baseline to 3.13.

Created with:
  roll-dep external/re2

* Roll external/spirv-headers/ 3469b164e..d0006a393 (3 commits)

3469b164e2...d0006a3938

$ git log 3469b164e..d0006a393 --date=short --no-merges --format='%ad %ae %s'
2023-07-05 lynix680 Regenerate headers
2023-06-30 lynix680 Add NZSL as a source language
2023-06-30 lynix680 Add NZSLc as a generator

Created with:
  roll-dep external/spirv-headers
This commit is contained in:
Steven Perron 2023-07-10 08:21:45 -07:00 committed by GitHub
parent e751c7e7db
commit 4be7d0e3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -7,13 +7,13 @@ vars = {
'effcee_revision': '19b4aa87af25cb4ee779a071409732f34bfc305c', 'effcee_revision': '19b4aa87af25cb4ee779a071409732f34bfc305c',
'googletest_revision': 'be03d00f5f0cc3a997d1a368bee8a1fe93651f48', 'googletest_revision': '4a1a299b206ba250a4318f74938ea67c75c3c0c9',
# Use protobufs before they gained the dependency on abseil # Use protobufs before they gained the dependency on abseil
'protobuf_revision': 'v21.12', 'protobuf_revision': 'v21.12',
're2_revision': '1c1ffbe3c6b2bd26f65b1c1b7bc71d16ba162cf1', 're2_revision': 'a57a1d6462a1613e5e2cfd6fb1ce26d36706a9af',
'spirv_headers_revision': '3469b164e25cee24435029a569933cb42578db5d', 'spirv_headers_revision': 'd0006a3938d7acedffb26ab517fe3e95b5288cc6',
} }
deps = { deps = {

4
kokoro/scripts/linux/build-docker.sh
View File

@ -156,7 +156,7 @@ elif [ $TOOL = "cmake-smoketest" ]; then
echo $(date): ctest completed. echo $(date): ctest completed.
elif [ $TOOL = "cmake-android-ndk" ]; then elif [ $TOOL = "cmake-android-ndk" ]; then
using cmake-3.17.2 using cmake-3.17.2
using ndk-r21d using ndk-r25c
using ninja-1.10.0 using ninja-1.10.0
clean_dir "$ROOT_DIR/build" clean_dir "$ROOT_DIR/build"
@ -176,7 +176,7 @@ elif [ $TOOL = "cmake-android-ndk" ]; then
ninja ninja
echo $(date): Build completed. echo $(date): Build completed.
elif [ $TOOL = "android-ndk-build" ]; then elif [ $TOOL = "android-ndk-build" ]; then
using ndk-r21d using ndk-r25c
clean_dir "$ROOT_DIR/build" clean_dir "$ROOT_DIR/build"
cd "$ROOT_DIR/build" cd "$ROOT_DIR/build"