Removed deprecated separate triangle and texture demos, replaced with android build files (wip) (#97)

triangle/android/.gitignore

@@ -1,10 +0,0 @@
-/assets/
-/res/
-/bin/
-/libs/
-/obj/
-/build.xml
-/local.properties
-/project.properties
-/proguard-project.txt
-*.apk

triangle/android/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-		package="de.saschawillems.vulkanTriangle"
-        android:versionCode="1"
-        android:versionName="1.0">
-		
-    <uses-sdk android:minSdkVersion="19" /> 
-	
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
-    <uses-feature android:name="android.software.leanback" android:required="false"/>  	
-	
-    <application android:label="vulkanTriangle" android:icon="@drawable/icon" android:hasCode="false">
-		<activity android:name="android.app.NativeActivity"
-                android:label="Vulkan Triangle"
-                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				android:launchMode="singleTask"
-                android:configChanges="orientation|screenSize|keyboardHidden">
-			<meta-data android:name="android.app.lib_name" android:value="vulkanTriangle" />
-			<intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-				<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>  
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>

triangle/android/build.bat

@@ -1,22 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
-	echo ndk-build has failed, build cancelled
-	cd..
-
-	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..
-)

triangle/android/jni/Android.mk

@@ -1,50 +0,0 @@
-LOCAL_PATH := $(call my-dir)/..
-
-# assimp
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := assimp
-
-LOCAL_SRC_FILES = $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.so
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../external/assimp/include
-include $(PREBUILT_SHARED_LIBRARY)
-
-# vulkan example
-
-DATADIR := $(LOCAL_PATH)/../../data
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := vulkanTriangle
-
-PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../triangle.cpp)
-PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)
-
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS
-LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android
-
-LOCAL_SRC_FILES := $(PROJECT_FILES)
-
-LOCAL_LDLIBS := -landroid -llog
-
-LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
-
-#LOCAL_SHARED_LIBRARIES += assimp
-
-LOCAL_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_STATIC_LIBRARIES += cpufeatures
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module, android/native_app_glue)
-$(call import-module, android/cpufeatures)

triangle/android/jni/Application.mk

@@ -1,5 +0,0 @@
-APP_PLATFORM := android-19
-APP_ABI := armeabi-v7a
-APP_STL := c++_static
-APP_CPPFLAGS := -std=c++11
-NDK_TOOLCHAIN_VERSION := clang