diff --git a/core/build.gradle b/core/build.gradle index 434df1e0..af0d9b2e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -38,7 +38,7 @@ android { task goBuild(type: Exec) { if (Os.isFamily(Os.FAMILY_WINDOWS)) { executable "cmd.exe" - args "/c", "src\\overture\\make.bat " + minSdkVersion + args "/c", file("src/overture/make.bat").absolutePath , minSdkVersion } else { executable "sh" args "-c", "src/overture/make.bash " + minSdkVersion @@ -48,7 +48,7 @@ task goBuild(type: Exec) { task goClean(type: Exec) { if (Os.isFamily(Os.FAMILY_WINDOWS)) { executable "cmd.exe" - args "/c", "src\\overture\\clean.bat" + args "/c", file("src/overture/clean.bat").absolutePath } else { executable "sh" args "-c", "src/overture/clean.bash" diff --git a/core/src/overture/make.bat b/core/src/overture/make.bat index fa23ba8b..88e24f36 100644 --- a/core/src/overture/make.bat +++ b/core/src/overture/make.bat @@ -28,21 +28,35 @@ MKDIR %TARGET%\armeabi-v7a>nul 2>nul MKDIR %TARGET%\x86>nul 2>nul MKDIR %TARGET%\arm64-v8a>nul 2>nul +SET CC=%ANDROID_NDK_HOME%\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe + +REM Check environment availability +IF NOT EXIST %CC% ( + ECHO "gcc not found" + EXIT 1 +) + +WHERE python.exe +IF "%ERRORLEVEL%" == 1 ( + ECHO "python not found" + EXIT 1 +) + IF NOT EXIST %ANDROID_ARM_CC% ( ECHO "Make standalone toolchain for ARM arch" - %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^ + python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^ --api %MIN_API% --install-dir %ANDROID_ARM_TOOLCHAIN% ) IF NOT EXIST %ANDROID_ARM64_CC% ( ECHO "Make standalone toolchain for ARM64 arch" - %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^ + python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^ --api %MIN_API% --install-dir %ANDROID_ARM64_TOOLCHAIN% ) IF NOT EXIST %ANDROID_X86_CC% ( ECHO "Make standalone toolchain for X86 arch" - %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^ + python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^ --api %MIN_API% --install-dir %ANDROID_X86_TOOLCHAIN% )