From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 14 May 2020 13:28:21 +0000 (+0100)
Subject: Bump Android API level to 23 to allow it to run on Android 10
X-Git-Tag: v8.10~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b8d1cdb116023d4f88dd66773657c933c215660;p=users%2Fdwmw2%2Fopenconnect.git

Bump Android API level to 23 to allow it to run on Android 10

Nobody cares about older API versions, which would only be needed
to support Android versions older than 6.0.

cf. https://gitlab.com/openconnect/openconnect/-/merge_requests/92

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/android/Makefile b/android/Makefile
index 1947bff8..e98ee667 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -10,15 +10,18 @@
 #
 # It should also be fairly simple to extend this to cross-compile for any target
 
-NDK     := /opt/android-sdk-linux_x86/android-ndk-r16b
-ARCH    := arm
+# Last tested with https://dl.google.com/android/repository/android-ndk-r21b-linux-x86_64.zip
+
+
+NDK     := /opt/android-sdk-linux_x86/android-ndk-r21b
+ARCH    := x86_64
+API_LEVEL := 23
 
 EXTRA_CFLAGS :=
 
 # You should be able to just 'make ARCH=x86' and it should DTRT.
 ifeq ($(ARCH),arm)
 TRIPLET := arm-linux-androideabi
-API_LEVEL := 14
 EXTRA_CFLAGS := -march=armv7-a -mthumb
 endif
 ifeq ($(ARCH),arm64)
@@ -27,11 +30,9 @@ API_LEVEL := 26
 endif
 ifeq ($(ARCH),x86)
 TRIPLET := i686-linux-android
-API_LEVEL := 14
 endif
 ifeq ($(ARCH),x86_64)
 TRIPLET := x86_64-linux-android
-API_LEVEL := 21
 endif
 
 TOPDIR := $(shell pwd)