From 3ed6237c3b7bb22883e3de52dd957313279903f8 Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Tue, 12 May 2020 03:31:47 -0700
Subject: [PATCH] Cleanup and improve back button behavior

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

diff --git a/colorchord2/android/AndroidManifest.xml b/colorchord2/android/AndroidManifest.xml
index 1052ea0..c5223c8 100644
--- a/colorchord2/android/AndroidManifest.xml
+++ b/colorchord2/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?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="3">
+          android:versionCode="4">
 
     <uses-permission android:name="android.permission.SET_RELEASE_APP"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
diff --git a/colorchord2/android/Makefile b/colorchord2/android/Makefile
index 095158b..999f589 100644
--- a/colorchord2/android/Makefile
+++ b/colorchord2/android/Makefile
@@ -3,7 +3,10 @@ APPNAME=colorchord
 RAWDRAWANDROID=rawdrawandroid
 PACKAGENAME?=org.cnlohr.$(APPNAME)
 
-CFLAGS:=-I. -I.. -Irawdrawandroid/rawdraw -I../cnfa -I../../embeddedcommon -ffunction-sections -Os -DPRINTF_NO_OVERRIDDE
+CFLAGS:=-I. -I.. -Irawdrawandroid/rawdraw -I../cnfa -I../../embeddedcommon \
+	-ffunction-sections -Os -s -DPRINTF_NO_OVERRIDDE -fvisibility=hidden  \
+	-DRDALOGFNCB=example_log_function
+
 LDFLAGS:=-s -lOpenSLES
 
 CC_C:=  ../main.c  ../dft.c ../decompose.c ../filter.c ../color.c ../notefinder.c ../util.c ../hook.c ../outdrivers.c ../parameters.c ../chash.c ../OutputVoronoi.c ../OutputProminent.c ../DisplayArray.c ../OutputLinear.c ../DisplayPie.c ../DisplayNetwork.c ../../embeddedcommon/DFT32.c ../OutputCells.c ../configs.c
diff --git a/colorchord2/android/rawdrawandroid b/colorchord2/android/rawdrawandroid
index 48945dc..d07d11d 160000
--- a/colorchord2/android/rawdrawandroid
+++ b/colorchord2/android/rawdrawandroid
@@ -1 +1 @@
-Subproject commit 48945dcd0887e5e520ab8795e78027133e66aa35
+Subproject commit d07d11decf22945b797991bc7cf05fbcf26001d4