Working on android

Author: jherico

.gitignore

@@ -212,9 +212,9 @@ bin_debug
 # Android Studio
 .idea
 *.iml
+*.hprof
+gradle
 gradlew
 gradlew.bat
-*.hprof
 local.properties
-android/gradle
-android/app/src/main/jniLibs
+android/src/main/jniLibs

CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_policy(VERSION 3.6)
 include("cmake/defaults.cmake")
 set(NAME VulkanCppExamples)
 
+
 project(${NAME})
 
 if (NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
@@ -13,7 +14,6 @@ include("cmake/compiler.cmake")
 
 find_package(Threads REQUIRED)
 
-
 # This define is specific to Vulkan has a depth range of [0, 1], unlike OpenGL which has a [-1, 1] 
 add_definitions(-DGLM_FORCE_DEPTH_ZERO_TO_ONE)
 
@@ -29,8 +29,8 @@ if (NOT ANDROID)
     set_target_properties(SetupDebug PROPERTIES FOLDER "CMakeTargets")
 endif()
 
-
 if (ANDROID)
+    add_definitions(-DVULKAN_HPP_NO_SMART_HANDLE)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
     set(APP_GLUE_DIR ${ANDROID_NDK}/sources/android/native_app_glue)
     include_directories(${APP_GLUE_DIR})

android/app/build.gradle

@@ -1,23 +1,51 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+apply plugin: 'com.android.application'
 
-buildscript {
-    
-    repositories {
-        google()
-        jcenter()
+android {
+    compileSdkVersion 26
+    defaultConfig {
+        applicationId "org.saintandreas.vulkanexamples"
+        minSdkVersion 26
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        ndk { abiFilter "arm64-v8a" }
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_PLATFORM=android-26',
+                        '-DANDROID_TOOLCHAIN=clang',
+                        '-DANDROID_STL=c++_shared',
+                        '-DVULKAN_SDK=' + vulkan_sdk
+            }
+        }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs += "${android.ndkDirectory}/sources/third_party/vulkan/src/build-android/jniLibs"
+            assets.srcDirs += "$projectDir.absolutePath/../data"
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path '../CMakeLists.txt'
+        }
     }
-}
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
 }

android/app/proguard-rules.pro

@@ -47,12 +47,6 @@
             android:name=".examples.ComputeShader">
             <meta-data android:name="android.app.lib_name" android:value="computeshader" />
         </activity>
-        <!--
-        <activity android:configChanges="orientation|screenSize|keyboardHidden" android:launchMode="singleTask" android:screenOrientation="landscape" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            android:name=".examples.Context">
-            <meta-data android:name="android.app.lib_name" android:value="context" />
-        </activity>
-        -->
         <activity android:configChanges="orientation|screenSize|keyboardHidden" android:launchMode="singleTask" android:screenOrientation="landscape" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:name=".examples.Deferred">
             <meta-data android:name="android.app.lib_name" android:value="deferred" />