diff options
Diffstat (limited to 'android/WALT/app')
-rw-r--r-- | android/WALT/app/build.gradle | 17 | ||||
-rw-r--r-- | android/WALT/app/src/main/jni/Android.mk | 3 | ||||
-rw-r--r-- | android/WALT/app/src/main/jni/Application.mk | 2 | ||||
-rw-r--r-- | android/WALT/app/src/main/res/xml/preferences.xml | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/android/WALT/app/build.gradle b/android/WALT/app/build.gradle index ec99946..71a473c 100644 --- a/android/WALT/app/build.gradle +++ b/android/WALT/app/build.gradle @@ -2,18 +2,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.3' defaultConfig { applicationId "org.chromium.latency.walt" - minSdkVersion 17 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 29 versionCode 9 versionName "0.1.9" - externalNativeBuild.ndkBuild { - arguments "APP_PLATFORM=android-14", "APP_ALLOW_MISSING_DEPS=true" - } } externalNativeBuild.ndkBuild { @@ -30,6 +27,12 @@ android { } } } + + ndkVersion "21.0.6113669" + + lintOptions { + abortOnError false + } } dependencies { diff --git a/android/WALT/app/src/main/jni/Android.mk b/android/WALT/app/src/main/jni/Android.mk index 08d71f2..edf1ddf 100644 --- a/android/WALT/app/src/main/jni/Android.mk +++ b/android/WALT/app/src/main/jni/Android.mk @@ -22,9 +22,6 @@ LOCAL_SRC_FILES := sync_clock_jni.c sync_clock.c player.c LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror -Wno-deprecated-declarations -# needed for logcat -LOCAL_SHARED_LIBRARIES := libcutils - LOCAL_LDLIBS := -lOpenSLES -llog include $(BUILD_SHARED_LIBRARY) diff --git a/android/WALT/app/src/main/jni/Application.mk b/android/WALT/app/src/main/jni/Application.mk index 7c01d06..a6cb06d 100644 --- a/android/WALT/app/src/main/jni/Application.mk +++ b/android/WALT/app/src/main/jni/Application.mk @@ -14,4 +14,4 @@ # APP_ABI := all -APP_PLATFORM := android-9 +APP_PLATFORM := android-21 diff --git a/android/WALT/app/src/main/res/xml/preferences.xml b/android/WALT/app/src/main/res/xml/preferences.xml index 6482571..612c089 100644 --- a/android/WALT/app/src/main/res/xml/preferences.xml +++ b/android/WALT/app/src/main/res/xml/preferences.xml @@ -1,5 +1,5 @@ <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:walt="http://schemas.android.com/apk/res/org.chromium.latency.walt"> + xmlns:walt="http://schemas.android.com/apk/res-auto"> <android.support.v7.preference.PreferenceScreen android:key="pref_general_screen" |