diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /android/xscreensaver/jni/Application.mk | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'android/xscreensaver/jni/Application.mk')
-rw-r--r-- | android/xscreensaver/jni/Application.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/xscreensaver/jni/Application.mk b/android/xscreensaver/jni/Application.mk index d3f5436..311946d 100644 --- a/android/xscreensaver/jni/Application.mk +++ b/android/xscreensaver/jni/Application.mk @@ -1,7 +1,7 @@ # Get this value from android/Makefile APP_ABI := $(shell echo $$APP_ABI) -APP_STL := stlport_static -APP_PLATFORM := android-14 +APP_STL := c++_static +APP_PLATFORM := android-16 # ^^ APP_PLATFORM is minimum API version supported # https://android.googlesource.com/platform/ndk/+/master/docs/user/common_problems.md#target-api-set-higher-than-device-api |