From 8c4dc36b875ab990454faa9c044e1355ddf6646c Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Tue, 15 Jan 2019 08:52:15 +0100
Subject: Android: Enable building again with the supported NDK version

Change-Id: I9cf8c41c4fb37728154bc0cd74124a549b00e3ff
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 qtserialport.pro                    | 1 -
 src/serialport/qserialport_unix.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/qtserialport.pro b/qtserialport.pro
index 3dabc4b..5b7cd41 100644
--- a/qtserialport.pro
+++ b/qtserialport.pro
@@ -7,7 +7,6 @@ requires(!integrity)
 requires(!vxworks)
 requires(!winrt)
 requires(!uikit)
-requires(!android)
 requires(!emscripten)
 
 load(configure)
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index dd0339f..294782b 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -70,10 +70,10 @@
 # ifdef Q_OS_ANDROID
 #  include <android/api-level.h>
 # else
-#  define __ANDROID_API__ 21
+#  define __ANDROID_API__ 16
 # endif
 
-# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 21)
+# if !defined(Q_OS_ANDROID) || (!defined(Q_PROCESSOR_X86) && __ANDROID_API__ < 16)
 struct termios2 {
     tcflag_t c_iflag;       /* input mode flags */
     tcflag_t c_oflag;       /* output mode flags */
-- 
cgit v1.2.1