diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-06-21 11:17:07 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-06-21 11:17:07 +0000 |
| commit | 7911ae4279f8cf80e17b6b21eb54bbae9508fc55 (patch) | |
| tree | 444deec1c6e57c7e931bb8d10284f99526072dfb /ide | |
| parent | 63a48a399a2eedfa7380c5795771a2ea0233bc9a (diff) | |
Android: Updated to current Android Studio and NDK, fixed STL to use Google provided ANdroid STL.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12953 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/AndroidStudio3/app/app.iml | 4 | ||||
| -rw-r--r-- | ide/AndroidStudio3/app/build.gradle | 5 | ||||
| -rw-r--r-- | ide/AndroidStudio3/build.gradle | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ide/AndroidStudio3/app/app.iml b/ide/AndroidStudio3/app/app.iml index 12d8299ac..14dc6e9e9 100644 --- a/ide/AndroidStudio3/app/app.iml +++ b/ide/AndroidStudio3/app/app.iml @@ -96,8 +96,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> @@ -106,7 +104,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> @@ -114,7 +111,6 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> diff --git a/ide/AndroidStudio3/app/build.gradle b/ide/AndroidStudio3/app/build.gradle index fefeafe85..dd66c8d93 100644 --- a/ide/AndroidStudio3/app/build.gradle +++ b/ide/AndroidStudio3/app/build.gradle @@ -7,6 +7,11 @@ apply plugin: 'com.android.application' applicationId 'org.fltk.android_hello' minSdkVersion 14 targetSdkVersion 25 + externalNativeBuild { + cmake { + arguments '-DANDROID_STL=c++_shared' + } + } } buildTypes { release { diff --git a/ide/AndroidStudio3/build.gradle b/ide/AndroidStudio3/build.gradle index 3fe555653..2b6e2aa07 100644 --- a/ide/AndroidStudio3/build.gradle +++ b/ide/AndroidStudio3/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.1.3' } } |