aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Marty <benoit.marty@gmail.com>2019-04-30 18:22:30 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-04-30 18:22:30 -0400
commit69feb86c01838cffdfbfdb5dc7d9432667832d95 (patch)
tree4fe42063edb629c363f000b0c141c293fc10e35c
parent27fcc337a3b6484dee8f31773d083f14463bc33f (diff)
update to newer Android SDK version
-rw-r--r--android/olm-sdk/build.gradle7
-rw-r--r--android/olm-sdk/src/main/jni/Application.mk2
2 files changed, 4 insertions, 5 deletions
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index ade227e..9305baa 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -3,12 +3,11 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.library'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
defaultConfig {
minSdkVersion 11
- targetSdkVersion 21
+ targetSdkVersion 28
versionCode 311
versionName "3.1.1"
version "3.1.1"
@@ -120,7 +119,7 @@ def gitRevisionDate() {
dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+ androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
diff --git a/android/olm-sdk/src/main/jni/Application.mk b/android/olm-sdk/src/main/jni/Application.mk
index e11f39a..e052911 100644
--- a/android/olm-sdk/src/main/jni/Application.mk
+++ b/android/olm-sdk/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
APP_PLATFORM := android-16
APP_ABI := arm64-v8a armeabi-v7a x86_64 x86
-APP_STL := gnustl_static
+APP_STL := c++_static \ No newline at end of file