From 4dfeb870b77d83f31ac8c87d91756b66e8e5eaa2 Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Sun, 17 May 2020 05:11:32 -0700
Subject: [PATCH] Allow ColorChord to run down to Android 5.1 (SDK 22)

---
 colorchord2/android/AndroidManifest.xml | 4 ++--
 colorchord2/android/Makefile            | 3 ++-
 colorchord2/android/rawdrawandroid      | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/colorchord2/android/AndroidManifest.xml b/colorchord2/android/AndroidManifest.xml
index 8d08c57..4acec47 100644
--- a/colorchord2/android/AndroidManifest.xml
+++ b/colorchord2/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.cnlohr.colorchord" 
-          android:versionCode="6">
+          android:versionCode="8">
 
-	<uses-sdk android:minSdkVersion="26"
+	<uses-sdk android:minSdkVersion="22"
           android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.SET_RELEASE_APP"/>
diff --git a/colorchord2/android/Makefile b/colorchord2/android/Makefile
index 891bb38..b9c3df1 100644
--- a/colorchord2/android/Makefile
+++ b/colorchord2/android/Makefile
@@ -7,7 +7,8 @@ CFLAGS:=-I. -I.. -Irawdrawandroid/rawdraw -I../cnfa -I../../embeddedcommon \
 	-ffunction-sections -Os -s -DPRINTF_NO_OVERRIDDE -fvisibility=hidden  \
 	-DRDALOGFNCB=example_log_function
 
-ANDROIDVERSION=28
+ANDROIDVERSION=22
+ANDROIDTARGET=28
 
 LDFLAGS:=-s -lOpenSLES
 
diff --git a/colorchord2/android/rawdrawandroid b/colorchord2/android/rawdrawandroid
index 64548dc..aa42f6f 160000
--- a/colorchord2/android/rawdrawandroid
+++ b/colorchord2/android/rawdrawandroid
@@ -1 +1 @@
-Subproject commit 64548dce184f2888a582cf194116c98cb7d3a964
+Subproject commit aa42f6fcb13e6b3616f671d3164e979cbbf63219