From 444d06e9abe8eb63aaddfc736a35be4c30621dee Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Sun, 12 Mar 2017 10:52:09 +0100
Subject: [PATCH] Updated android build files

---
 android/triangle/AndroidManifest.xml |  1 +
 android/triangle/build.bat           | 22 -----------------
 android/triangle/build.py            | 36 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 22 deletions(-)
 delete mode 100644 android/triangle/build.bat
 create mode 100644 android/triangle/build.py

diff --git a/android/triangle/AndroidManifest.xml b/android/triangle/AndroidManifest.xml
index 7e761c2c..3a80cf84 100644
--- a/android/triangle/AndroidManifest.xml
+++ b/android/triangle/AndroidManifest.xml
@@ -15,6 +15,7 @@
                 android:label="Triangle"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
+                android:screenOrientation="landscape"                
                 android:configChanges="orientation|screenSize|keyboardHidden">
 			<meta-data android:name="android.app.lib_name" android:value="vulkanTriangle" />
 			<intent-filter>
diff --git a/android/triangle/build.bat b/android/triangle/build.bat
deleted file mode 100644
index 62fb7159..00000000
--- a/android/triangle/build.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
-	echo ndk-build has failed, build cancelled
-	cd..
-
-	mkdir "assets\shaders\base"
-	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
-	
-
-	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
-) ELSE (
-	echo error : ndk-build failed with errors!
-	cd..
-)
diff --git a/android/triangle/build.py b/android/triangle/build.py
new file mode 100644
index 00000000..e5e933ab
--- /dev/null
+++ b/android/triangle/build.py
@@ -0,0 +1,36 @@
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+APK_NAME = "vulkanTriangle"
+ASSETS_SHADERS = ["triangle.vert.spv", "triangle.frag.spv"]
+
+if subprocess.call("ndk-build", shell=True) == 0:   
+    print("Build successful")
+
+    os.makedirs("./assets/shaders", exist_ok=True)
+    os.makedirs("./assets/shaders/base", exist_ok=True)
+    os.makedirs("./res/drawable", exist_ok=True)
+    
+    # Shaders    
+    # Base
+    for file in glob.glob("../../data/shaders/base/*.spv"):
+        shutil.copy(file, "./assets/shaders/base")    
+    # Sample
+    for file in ASSETS_SHADERS:
+        shutil.copy("../../data/shaders/%s" % file, "./assets/shaders")         
+
+    # Icon
+    shutil.copy("../../android/images/icon.png", "./res/drawable")      
+
+    if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
+        if len(sys.argv) > 1:
+            if sys.argv[1] == "-deploy":
+                if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
+                    print("Could not deploy to device!")
+    else:
+        print("Error during build process!")
+else:
+    print("Error building project!")