diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-12-22 11:12:49 -0700 |
|---|---|---|
| committer | Cody Northrop <cnorthrop@google.com> | 2016-12-22 14:01:17 -0700 |
| commit | a1ad84d2559676968345779e853a5741c10c7351 (patch) | |
| tree | 360638895d49750bd50912a521bb35d346b7b989 /build-android | |
| parent | 51b57689ecd37660f8bf875d8e8a192a12080f2f (diff) | |
android: Preserve toolchain build if present
Similar to a2e6ddd1 which preserves it for desktop.
Diffstat (limited to 'build-android')
| -rwxr-xr-x | build-android/update_external_sources_android.bat | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/build-android/update_external_sources_android.bat b/build-android/update_external_sources_android.bat index 2c771d7d..1961d396 100755 --- a/build-android/update_external_sources_android.bat +++ b/build-android/update_external_sources_android.bat @@ -112,9 +112,6 @@ set sync-shaderc=1 set build-shaderc=1 if %sync-glslang% equ 1 ( - if exist %GLSLANG_DIR% ( - rd /S /Q %GLSLANG_DIR% - ) if not exist %GLSLANG_DIR% ( call:create_glslang ) @@ -124,9 +121,6 @@ if %sync-glslang% equ 1 ( ) if %sync-spirv-tools% equ 1 ( - if exist %SPIRV_TOOLS_DIR% ( - rd /S /Q %SPIRV_TOOLS_DIR% - ) if %ERRORLEVEL% neq 0 (goto:error) if not exist %SPIRV_TOOLS_DIR% ( call:create_spirv-tools @@ -137,9 +131,6 @@ if %sync-spirv-tools% equ 1 ( ) if %sync-spirv-headers% equ 1 ( - if exist %SPIRV_HEADERS_DIR% ( - rd /S /Q %SPIRV_HEADERS_DIR% - ) if %ERRORLEVEL% neq 0 (goto:error) if not exist %SPIRV_HEADERS_DIR% ( call:create_spirv-headers @@ -150,9 +141,6 @@ if %sync-spirv-headers% equ 1 ( ) if %sync-shaderc% equ 1 ( - if exist %SHADERC_DIR% ( - rd /S /Q %SHADERC_DIR% - ) if not exist %SHADERC_DIR% ( call:create_shaderc ) @@ -189,7 +177,7 @@ REM // ======== Functions ======== // :create_glslang echo. echo Creating local glslang repository %GLSLANG_DIR% - mkdir %GLSLANG_DIR% + if not exist "%GLSLANG_DIR%\" mkdir %GLSLANG_DIR% cd %GLSLANG_DIR% git clone https://android.googlesource.com/platform/external/shaderc/glslang . git checkout %GLSLANG_REVISION% @@ -214,7 +202,7 @@ goto:eof :create_spirv-tools echo. echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR% - mkdir %SPIRV_TOOLS_DIR% + if not exist "%SPIRV_TOOLS_DIR%\" mkdir %SPIRV_TOOLS_DIR% cd %SPIRV_TOOLS_DIR% git clone https://android.googlesource.com/platform/external/shaderc/spirv-tools . git checkout %SPIRV_TOOLS_REVISION% @@ -239,7 +227,7 @@ goto:eof :create_spirv-headers echo. echo Creating local spirv-headers repository %SPIRV_HEADERS_DIR% - mkdir %SPIRV_HEADERS_DIR% + if not exist "%SPIRV_HEADERS_DIR%\" mkdir %SPIRV_HEADERS_DIR% cd %SPIRV_HEADERS_DIR% git clone https://android.googlesource.com/platform/external/shaderc/spirv-headers . git checkout %SPIRV_HEADERS_REVISION% @@ -264,7 +252,7 @@ goto:eof :create_shaderc echo. echo Creating local shaderc repository %SHADERC_DIR% - mkdir %SHADERC_DIR% + if not exist "%SHADERC_DIR%\" mkdir %SHADERC_DIR% cd %SHADERC_DIR% git clone https://android.googlesource.com/platform/external/shaderc/shaderc . git checkout %SHADERC_REVISION% |