diff --git a/android/examples/_template/CMakeLists.txt b/android/examples/_template/CMakeLists.txt index 9118badc..3e379c32 100644 --- a/android/examples/_template/CMakeLists.txt +++ b/android/examples/_template/CMakeLists.txt @@ -8,7 +8,6 @@ set(EXTERNAL_DIR ../../../external) set(LIB_DIR ../../../libs) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -DVK_USE_PLATFORM_ANDROID_KHR -DVK_NO_PROTOTYPES") -#set(CMAKE_SHARED_LINKER_FLAGS "--no-fatal-warnings") file(GLOB EXAMPLE_SRC "${SRC_DIR}/*.cpp") file(GLOB BASE_SRC "${BASE_DIR}/*.cpp") diff --git a/android/examples/_template/build.gradle b/android/examples/_template/build.gradle index 7e447817..3aceaeb1 100644 --- a/android/examples/_template/build.gradle +++ b/android/examples/_template/build.gradle @@ -9,14 +9,13 @@ android { targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" ndk { abiFilters "armeabi-v7a" } externalNativeBuild { cmake { - cppFlags "-std=c++11" - arguments "-DANDROID_STL=c++_static" + cppFlags "-std=c++14" + arguments "-DANDROID_STL=c++_shared", '-DANDROID_TOOLCHAIN=clang' } } } diff --git a/android/examples/_template/proguard-rules.pro b/android/examples/_template/proguard-rules.pro deleted file mode 100644 index 93aade8d..00000000 --- a/android/examples/_template/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /home/SERILOCAL/l.west/Android/Sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile