From fac5b37fd5f75e3f62d3c07cbd74e37bf4aae20b Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Thu, 31 Mar 2016 16:33:00 -0600
Subject: toolchain: Fix android build

Let's start tracking these revisions independent of desktop
---
 buildAndroid/glslang_revision_android            |  1 +
 buildAndroid/shaderc_revision                    |  1 -
 buildAndroid/shaderc_revision_android            |  1 +
 buildAndroid/spirv-tools_revision_android        |  1 +
 buildAndroid/update_external_sources_android.bat | 18 +++++++++---------
 buildAndroid/update_external_sources_android.sh  |  6 +++---
 6 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 buildAndroid/glslang_revision_android
 delete mode 100644 buildAndroid/shaderc_revision
 create mode 100644 buildAndroid/shaderc_revision_android
 create mode 100644 buildAndroid/spirv-tools_revision_android

diff --git a/buildAndroid/glslang_revision_android b/buildAndroid/glslang_revision_android
new file mode 100644
index 00000000..c48dee1a
--- /dev/null
+++ b/buildAndroid/glslang_revision_android
@@ -0,0 +1 @@
+3c5b1e6b31aca0eb52fe7e82a963ff735f1de31b
diff --git a/buildAndroid/shaderc_revision b/buildAndroid/shaderc_revision
deleted file mode 100644
index 04b23248..00000000
--- a/buildAndroid/shaderc_revision
+++ /dev/null
@@ -1 +0,0 @@
-53cf6692879c6dcd5f4ccdffb8c10bb17b5e9d55
diff --git a/buildAndroid/shaderc_revision_android b/buildAndroid/shaderc_revision_android
new file mode 100644
index 00000000..04b23248
--- /dev/null
+++ b/buildAndroid/shaderc_revision_android
@@ -0,0 +1 @@
+53cf6692879c6dcd5f4ccdffb8c10bb17b5e9d55
diff --git a/buildAndroid/spirv-tools_revision_android b/buildAndroid/spirv-tools_revision_android
new file mode 100644
index 00000000..e83c901e
--- /dev/null
+++ b/buildAndroid/spirv-tools_revision_android
@@ -0,0 +1 @@
+9149a66ca406d86967b104cac209bad309fd2c33
diff --git a/buildAndroid/update_external_sources_android.bat b/buildAndroid/update_external_sources_android.bat
index dac5f2b9..f2b719fc 100755
--- a/buildAndroid/update_external_sources_android.bat
+++ b/buildAndroid/update_external_sources_android.bat
@@ -65,29 +65,29 @@ if %errorCode% neq 0 (goto:error)
 
 REM Read the target versions from external file, which is shared with Linux script
 
-if not exist %BUILD_DIR%\glslang_revision (
+if not exist %ANDROID_BUILD_DIR%\glslang_revision_android (
    echo.
-   echo Missing glslang_revision file. Place it in %BUILD_DIR%
+   echo Missing glslang_revision_android file. Place it in %ANDROID_BUILD_DIR%
    goto:error
 )
 
-if not exist %BUILD_DIR%\spirv-tools_revision (
+if not exist %ANDROID_BUILD_DIR%\spirv-tools_revision_android (
    echo.
-   echo Missing spirv-tools_revision file. Place it in %BUILD_DIR%
+   echo Missing spirv-tools_revision_android file. Place it in %ANDROID_BUILD_DIR%
    set errorCode=1
    goto:error
 )
 
-if not exist %ANDROID_BUILD_DIR%\shaderc_revision (
+if not exist %ANDROID_BUILD_DIR%\shaderc_revision_android (
    echo.
-   echo Missing shaderc_revision file. Place it in %BUILD_DIR%
+   echo Missing shaderc_revision_android file. Place it in %ANDROID_BUILD_DIR%
    set errorCode=1
    goto:error
 )
 
-set /p GLSLANG_REVISION= < glslang_revision
-set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision
-set /p SHADERC_REVISION= < shaderc_revision
+set /p GLSLANG_REVISION= < glslang_revision_android
+set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision_android
+set /p SHADERC_REVISION= < shaderc_revision_android
 echo GLSLANG_REVISION=%GLSLANG_REVISION%
 echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION%
 echo SHADERC_REVISION=%SHADERC_REVISION%
diff --git a/buildAndroid/update_external_sources_android.sh b/buildAndroid/update_external_sources_android.sh
index 0e788220..b40a367a 100755
--- a/buildAndroid/update_external_sources_android.sh
+++ b/buildAndroid/update_external_sources_android.sh
@@ -22,9 +22,9 @@ ANDROIDBUILDDIR=$PWD
 BUILDDIR=$ANDROIDBUILDDIR/..
 BASEDIR=$BUILDDIR/..
 
-GLSLANG_REVISION=$(cat $BUILDDIR/glslang_revision)
-SPIRV_TOOLS_REVISION=$(cat $BUILDDIR/spirv-tools_revision)
-SHADERC_REVISION=$(cat $ANDROIDBUILDDIR/shaderc_revision)
+GLSLANG_REVISION=$(cat $ANDROIDBUILDDIR/glslang_revision_android)
+SPIRV_TOOLS_REVISION=$(cat $ANDROIDBUILDDIR/spirv-tools_revision_android)
+SHADERC_REVISION=$(cat $ANDROIDBUILDDIR/shaderc_revision_android)
 
 echo "GLSLANG_REVISION=$GLSLANG_REVISION"
 echo "SPIRV_TOOLS_REVISION=$SPIRV_TOOLS_REVISION"
-- 
cgit v1.2.3