diff --git a/android/images/icon.png b/android/images/icon.png new file mode 100644 index 00000000..882f2a59 Binary files /dev/null and b/android/images/icon.png differ diff --git a/triangle/android/.gitignore b/triangle/android/.gitignore index 72d1fbf7..7a5d249c 100644 --- a/triangle/android/.gitignore +++ b/triangle/android/.gitignore @@ -1,4 +1,5 @@ /assets/ +/res/ /bin/ /libs/ /obj/ diff --git a/triangle/android/AndroidManifest.xml b/triangle/android/AndroidManifest.xml index 3c9012a7..ea92b870 100644 --- a/triangle/android/AndroidManifest.xml +++ b/triangle/android/AndroidManifest.xml @@ -1,10 +1,18 @@ - + + - - + + + + + + @@ -12,6 +20,7 @@ + diff --git a/triangle/android/build.bat b/triangle/android/build.bat index 17470d55..bfcd48f4 100644 --- a/triangle/android/build.bat +++ b/triangle/android/build.bat @@ -1,18 +1,22 @@ cd jni call ndk-build -if %ERRORLEVEL% GEQ 1 ( +if %ERRORLEVEL% EQU 0 ( echo ndk-build has failed, build cancelled cd.. - exit \b %errorlevel% + + mkdir "assets\shaders" + xcopy "..\..\data\shaders\triangle.vert.spv" "assets\shaders" /Y + xcopy "..\..\data\shaders\triangle.frag.spv" "assets\shaders" /Y + + mkdir "res\drawable" + xcopy "..\..\android\images\icon.png" "res\drawable" /Y + + call ant debug -Dout.final.file=vulkanTriangle.apk + + if "%1" == "-deploy" ( + adb install -r vulkanTriangle.apk + ) +) ELSE ( + echo error : ndk-build failed with errors! + cd.. ) -cd.. - -mkdir "assets\shaders" -xcopy "..\..\data\shaders\triangle.vert.spv" "assets\shaders" /Y -xcopy "..\..\data\shaders\triangle.frag.spv" "assets\shaders" /Y - -call ant debug -Dout.final.file=vulkanTriangle.apk - -if "%1" == "-deploy" ( - adb install -r vulkanTriangle.apk -) \ No newline at end of file