diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-08-01 10:27:25 -0600 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2016-08-02 13:41:58 -0600 |
| commit | f354c5e4fd64a936ca41549256bc76c1d136b4fd (patch) | |
| tree | 6fd8341860af4f115992475cb9bcc9ee676de5cd /build-android/update_external_sources_android.sh | |
| parent | 9ebf86e556fab3468ee29b2d806a375806745d88 (diff) | |
| download | usermoji-f354c5e4fd64a936ca41549256bc76c1d136b4fd.tar.xz | |
toolchain: Update revisions for Android
Also add spirv-headers, a new dependency for shaderc.
Diffstat (limited to 'build-android/update_external_sources_android.sh')
| -rwxr-xr-x | build-android/update_external_sources_android.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/build-android/update_external_sources_android.sh b/build-android/update_external_sources_android.sh index 4ceaeeb9..ba5153c6 100755 --- a/build-android/update_external_sources_android.sh +++ b/build-android/update_external_sources_android.sh @@ -24,6 +24,7 @@ BASEDIR=$BUILDDIR/external GLSLANG_REVISION=$(cat $ANDROIDBUILDDIR/glslang_revision_android) SPIRV_TOOLS_REVISION=$(cat $ANDROIDBUILDDIR/spirv-tools_revision_android) +SPIRV_HEADERS_REVISION=$(cat $ANDROIDBUILDDIR/spirv-headers_revision_android) SHADERC_REVISION=$(cat $ANDROIDBUILDDIR/shaderc_revision_android) echo "GLSLANG_REVISION=$GLSLANG_REVISION" @@ -62,6 +63,22 @@ function update_spirv-tools () { git checkout $SPIRV_TOOLS_REVISION } +function create_spirv-headers () { + rm -rf $BASEDIR/spirv-tools/external/spirv-headers + echo "Creating local spirv-headers repository ($BASEDIR/spirv-tools/external/spirv-headers)." + mkdir -p $BASEDIR/spirv-tools/external/spirv-headers + cd $BASEDIR/spirv-tools/external/spirv-headers + git clone https://github.com/KhronosGroup/SPIRV-Headers.git . + git checkout $SPIRV_HEADERS_REVISION +} + +function update_spirv-headers () { + echo "Updating $BASEDIR/spirv-tools/external/spirv-headers" + cd $BASEDIR/spirv-tools/external/spirv-headers + git fetch --all + git checkout $SPIRV_HEADERS_REVISION +} + function create_shaderc () { rm -rf $BASEDIR/shaderc echo "Creating local shaderc repository ($BASEDIR/shaderc)." @@ -95,6 +112,11 @@ if [ ! -d "$BASEDIR/spirv-tools" -o ! -d "$BASEDIR/spirv-tools/.git" ]; then fi update_spirv-tools +if [ ! -d "$BASEDIR/spirv-tools/external/spirv-headers" -o ! -d "$BASEDIR/spirv-tools/external/spirv-headers/.git" ]; then + create_spirv-headers +fi +update_spirv-headers + if [ ! -d "$BASEDIR/shaderc" -o ! -d "$BASEDIR/shaderc/.git" ]; then create_shaderc fi |