Update build to Android Studio 2.3.0 + ndk-r15b

ggfan · ggfan · commit 79f542b90bc4 · 2017-07-26T22:39:24.000-07:00
remove app_dummy() according to android/ndk#381
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,6 @@ build
 *~
 local.properties
 .externalNativeBuild
+.cdep
 
 
diff --git a/tutorial01_load_vulkan/app/build.gradle b/tutorial01_load_vulkan/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.google.vulkan.tutorials.one"
diff --git a/tutorial01_load_vulkan/app/src/main/jni/CMakeLists.txt b/tutorial01_load_vulkan/app/src/main/jni/CMakeLists.txt
@@ -11,4 +11,6 @@ add_library(vktuts SHARED
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -std=c++11 \
                      -DVK_USE_PLATFORM_ANDROID_KHR")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
+
 target_link_libraries(vktuts app-glue log android)
diff --git a/tutorial01_load_vulkan/app/src/main/jni/main.cpp b/tutorial01_load_vulkan/app/src/main/jni/main.cpp
@@ -56,7 +56,6 @@ void handle_cmd(android_app* app, int32_t cmd);
 
 // typical Android NativeActivity entry function
 void android_main(struct android_app* app) {
-  app_dummy();
 
   app->onAppCmd = handle_cmd;
 
diff --git a/tutorial01_load_vulkan/build.gradle b/tutorial01_load_vulkan/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial01_load_vulkan/gradle/wrapper/gradle-wrapper.properties b/tutorial01_load_vulkan/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 12 16:39:17 PDT 2016
+#Wed Jul 26 22:23:04 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/tutorial02_prebuild_layers/app/build.gradle b/tutorial02_prebuild_layers/app/build.gradle
@@ -7,7 +7,7 @@ def valLayerBinDir = "${ndkDir}/sources/third_party/vulkan/src/build-android/jni
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.vulkan.tutorials.two"
diff --git a/tutorial02_prebuild_layers/app/src/main/jni/CMakeLists.txt b/tutorial02_prebuild_layers/app/src/main/jni/CMakeLists.txt
@@ -19,5 +19,6 @@ include_directories(${VK_WRAPPER_DIR} ${VK_VAL_LAYER_SRC_DIR}/include)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror       \
                      -Wno-unused-variable -DUSE_DEBUG_EXTENTIONS \
                      -DVK_USE_PLATFORM_ANDROID_KHR")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 
 target_link_libraries(vktuts app-glue log android)
diff --git a/tutorial02_prebuild_layers/app/src/main/jni/main.cpp b/tutorial02_prebuild_layers/app/src/main/jni/main.cpp
@@ -57,7 +57,6 @@ void handle_cmd(android_app* app, int32_t cmd);
 
 // typical Android NativeActivity entry function
 void android_main(struct android_app* app) {
-  app_dummy();
 
   app->onAppCmd = handle_cmd;
 
diff --git a/tutorial02_prebuild_layers/build.gradle b/tutorial02_prebuild_layers/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial02_prebuild_layers/gradle/wrapper/gradle-wrapper.properties b/tutorial02_prebuild_layers/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 12 14:01:09 PDT 2016
+#Wed Jul 26 21:26:24 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/tutorial03_traceable_layers/app/CMakeLists.txt b/tutorial03_traceable_layers/app/CMakeLists.txt
@@ -20,5 +20,5 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror \
                      -Wno-unused-variable \
                      -DVK_USE_PLATFORM_ANDROID_KHR \
                      -DUSE_DEBUG_EXTENTIONS")
-
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 target_link_libraries(vktuts app-glue log android)
diff --git a/tutorial03_traceable_layers/app/src/main/jni/main.cpp b/tutorial03_traceable_layers/app/src/main/jni/main.cpp
@@ -57,7 +57,6 @@ void handle_cmd(android_app* app, int32_t cmd);
 
 // typical Android NativeActivity entry function
 void android_main(struct android_app* app) {
-  app_dummy();
 
   app->onAppCmd = handle_cmd;
 
diff --git a/tutorial04_first_window/app/CMakeLists.txt b/tutorial04_first_window/app/CMakeLists.txt
@@ -19,5 +19,5 @@ include_directories(${WRAPPER_DIR})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror \
                      -Wno-unused-variable \
                      -DVK_USE_PLATFORM_ANDROID_KHR")
-
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 target_link_libraries(vktuts app-glue log android)
diff --git a/tutorial04_first_window/app/build.gradle b/tutorial04_first_window/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId  "com.google.vulkan.tutorials.four"
diff --git a/tutorial04_first_window/app/src/main/jni/AndroidMain.cpp b/tutorial04_first_window/app/src/main/jni/AndroidMain.cpp
@@ -33,8 +33,6 @@ void handle_cmd(android_app* app, int32_t cmd) {
 }
 
 void android_main(struct android_app* app) {
-  // Magic call, please ignore it (Android specific).
-  app_dummy();
 
   // Set the callback to process system events
   app->onAppCmd = handle_cmd;
diff --git a/tutorial04_first_window/build.gradle b/tutorial04_first_window/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/tutorial04_first_window/gradle/wrapper/gradle-wrapper.properties b/tutorial04_first_window/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 17 21:14:42 PDT 2016
+#Wed Jul 26 22:32:41 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/tutorial05_triangle/app/CMakeLists.txt b/tutorial05_triangle/app/CMakeLists.txt
@@ -19,5 +19,5 @@ include_directories(${WRAPPER_DIR})
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror \
                      -Wno-unused-variable \
                      -DVK_USE_PLATFORM_ANDROID_KHR")
-
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 target_link_libraries(vktuts app-glue log android)
diff --git a/tutorial05_triangle/app/build.gradle b/tutorial05_triangle/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId  "com.google.vulkan.tutorials.five"
diff --git a/tutorial05_triangle/app/src/main/jni/AndroidMain.cpp b/tutorial05_triangle/app/src/main/jni/AndroidMain.cpp
@@ -33,8 +33,6 @@ void handle_cmd(android_app* app, int32_t cmd) {
 }
 
 void android_main(struct android_app* app) {
-  // Magic call, please ignore it (Android specific).
-  app_dummy();
 
   // Set the callback to process system events
   app->onAppCmd = handle_cmd;
diff --git a/tutorial05_triangle/build.gradle b/tutorial05_triangle/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/tutorial05_triangle/gradle/wrapper/gradle-wrapper.properties b/tutorial05_triangle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 25 17:13:33 GMT 2015
+#Wed Jul 26 21:24:56 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/tutorial06_texture/app/src/main/cpp/AndroidMain.cpp b/tutorial06_texture/app/src/main/cpp/AndroidMain.cpp
@@ -33,8 +33,6 @@ void handle_cmd(android_app* app, int32_t cmd) {
 }
 
 void android_main(struct android_app* app) {
-  // Magic call, please ignore it (Android specific).
-  app_dummy();
 
   // Set the callback to process system events
   app->onAppCmd = handle_cmd;
diff --git a/tutorial06_texture/app/src/main/cpp/CMakeLists.txt b/tutorial06_texture/app/src/main/cpp/CMakeLists.txt
@@ -34,7 +34,7 @@ if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} \
        -Wl,--no-warn-mismatch")
 endif()
-
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
 target_link_libraries(vktuts native_glue log android)
 
 ########     CDep package for shaderc    ######################

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.2.0-beta1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.3.0'`
`9`	`9`	`// NOTE: Do not place your application dependencies here; they belong`
`10`	`10`	`// in the individual module build.gradle files`
`11`	`11`	`}`