diff options
author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /android/xscreensaver/jni/Application.mk | |
parent | Flush X events before locking if we have an external ungrab command (diff) | |
parent | Update to 5.43 (diff) | |
download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'android/xscreensaver/jni/Application.mk')
-rw-r--r-- | android/xscreensaver/jni/Application.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/android/xscreensaver/jni/Application.mk b/android/xscreensaver/jni/Application.mk deleted file mode 100644 index 311946d..0000000 --- a/android/xscreensaver/jni/Application.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Get this value from android/Makefile -APP_ABI := $(shell echo $$APP_ABI) -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 - |