diff options
| author | Cort Stratton <cort@google.com> | 2018-02-01 23:25:21 -0800 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2018-02-05 16:05:28 -0700 |
| commit | 88c31ae4ba67db109a243fff545a8117514a4b5a (patch) | |
| tree | d3193865d800d851439f52c7a7ddc1fccbdd19fc /build-android/android-generate.bat | |
| parent | 9960ee8a3875a185d69dbdc8dc347862d3cfdf4d (diff) | |
| download | usermoji-88c31ae4ba67db109a243fff545a8117514a4b5a.tar.xz | |
scripts: Fix error if spirv-tools dir had no .git (#2346)
external_revision_generator.py generates a UUID for
VkValidationCacheEXT objects created by the layers, based on
the commit ID of the HEAD revision in the spirv-tools repo
used to build those layers. This implicitly required that
the spirv-tools source is hosted in a Git repository, which
is not the case in all validation layers build environments.
The script has been modified to accept *either* a path to
a Git working directory to query *or* a path to a file whose
contents are SHA1-hashed (if necessary) and treated as the
"commit ID" for the project.
Call sites for the script in the CMake and Android build paths
have been updated to use the --git_dir approach by default,
which matches the pre-existing behavior.
Diffstat (limited to 'build-android/android-generate.bat')
| -rw-r--r-- | build-android/android-generate.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index b3982f29..128543a4 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -34,6 +34,6 @@ py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_d py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_typemap_helper.h -py -3 ../../../scripts/external_revision_generator.py ../../third_party/shaderc/third_party/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h +py -3 ../../../scripts/external_revision_generator.py --git_dir ../../third_party/shaderc/third_party/spirv-tools -s SPIRV_TOOLS_COMMIT_ID -o spirv_tools_commit_id.h cd ../.. |