From ae69a754244c4e475c8d2591772ca8e005071d83 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Feb 2019 11:55:41 +0100
Subject: Update to 5.42

---
 android/xscreensaver/jni/Android.mk     | 1 +
 android/xscreensaver/jni/Application.mk | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'android/xscreensaver/jni')

diff --git a/android/xscreensaver/jni/Android.mk b/android/xscreensaver/jni/Android.mk
index 1e20a83..3396bd9 100644
--- a/android/xscreensaver/jni/Android.mk
+++ b/android/xscreensaver/jni/Android.mk
@@ -73,6 +73,7 @@ LOCAL_SRC_FILES += \
     hacks/glx/gllist.c \
     hacks/glx/glschool_alg.c \
     hacks/glx/glschool_gl.c \
+    hacks/glx/handsy_model.c \
     hacks/glx/involute.c \
     hacks/glx/lament_model.c \
     hacks/glx/pipeobjs.c \
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
 
-- 
cgit v1.2.3-55-g7522