From 093c99466f17714c8233e581aaa6dea3e06fb19e Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 7 May 2016 22:30:26 -0700
Subject: [PATCH] Various tweaks to get release build working

---
 Android/app/build.gradle                        | 2 +-
 Android/app/src/main/AndroidManifest.xml        | 1 +
 Android/app/src/main/res/values-de/strings.xml  | 7 ++++++-
 Android/app/src/main/res/values-es/strings.xml  | 7 ++++++-
 Android/app/src/main/res/values-fr/strings.xml  | 7 ++++++-
 Android/app/src/main/res/xml/a2backupscheme.xml | 3 +++
 Android/jni/build.sh                            | 2 +-
 7 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 Android/app/src/main/res/xml/a2backupscheme.xml

diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index 4b7cc224..a51c326f 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -37,5 +37,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.3.0'
 }
diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index 970a318d..a6980293 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="@xml/a2backupscheme"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
 
diff --git a/Android/app/src/main/res/values-de/strings.xml b/Android/app/src/main/res/values-de/strings.xml
index 07450e83..752ce92e 100644
--- a/Android/app/src/main/res/values-de/strings.xml
+++ b/Android/app/src/main/res/values-de/strings.xml
@@ -39,7 +39,6 @@
     <string name="disk_show_operation">Zeige Disk ][ Aktivität</string>
     <string name="disk_show_operation_summary">Zeigt wenn die Laufwerke lesen oder schreiben</string>
     <string name="emulation_continue">Fortsetzen…</string>
-    <string name="emulation_settings">Einstellungen…</string>
     <string name="emulation_disks">Lade Disk-Image…</string>
     <string name="header_disks">Diskette einlegen:</string>
     <string name="input_current">Aktuelles Touch Device</string>
@@ -169,5 +168,11 @@
     <string name="portrait_calibrate_keyboard_height">Keyboard height</string>
     <string name="portrait_calibrate_keyboard_position">Keyboard position</string>
     <string name="portrait_calibrate_summary">Adjust keyboard size, framebuffer position, etc</string>
+    <string name="crash_sigabrt">SIGABRT</string>
+    <string name="crash_sigfpe">SIGFPE</string>
+    <string name="reset">Reset</string>
+    <string name="reset_preferences">Reset settings</string>
+    <string name="reset_self_test">Self Test</string>
+    <string name="reset_soft">Soft</string>
 
 </resources>
diff --git a/Android/app/src/main/res/values-es/strings.xml b/Android/app/src/main/res/values-es/strings.xml
index fb7164bc..9bfe6c62 100644
--- a/Android/app/src/main/res/values-es/strings.xml
+++ b/Android/app/src/main/res/values-es/strings.xml
@@ -39,7 +39,6 @@
     <string name="disk_show_operation">Mostrar las operaciones de "Disk ]["</string>
     <string name="disk_show_operation_summary">Shows when disk drives are reading or writing</string>
     <string name="emulation_continue">Continuar…</string>
-    <string name="emulation_settings">Configuración…</string>
     <string name="emulation_disks">Insertar imagen de disquete…</string>
     <string name="header_disks">Insertar imagen de disquete:</string>
     <string name="input_current">Unidad de entrada actual</string>
@@ -169,5 +168,11 @@
     <string name="portrait_calibrate_summary">Adjust keyboard size, framebuffer position, etc</string>
     <string name="keyboard_glyph_scale">Keyboard glyphs scaled 2x</string>
     <string name="keyboard_glyph_scale_summary">(Makes keyboard appear less pixelated on large screens)</string>
+    <string name="crash_sigabrt">SIGABRT</string>
+    <string name="crash_sigfpe">SIGFPE</string>
+    <string name="reset">Reset</string>
+    <string name="reset_preferences">Reset settings</string>
+    <string name="reset_self_test">Self Test</string>
+    <string name="reset_soft">Soft</string>
 
 </resources>
diff --git a/Android/app/src/main/res/values-fr/strings.xml b/Android/app/src/main/res/values-fr/strings.xml
index a4baf723..b8bf3094 100644
--- a/Android/app/src/main/res/values-fr/strings.xml
+++ b/Android/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,6 @@
     <string name="disk_show_operation">Afficher les opérations (disque) ][</string>
     <string name="disk_show_operation_summary">Indique si les disques sont en lecture ou en écriture</string>
     <string name="emulation_continue">Continuer…</string>
-    <string name="emulation_settings">Configurations…</string>
     <string name="emulation_disks">Chargement de l\'image disque…</string>
     <string name="header_disks">Insérer la disquettte :</string>
     <string name="input_current">Tactile</string>
@@ -169,5 +168,11 @@
     <string name="portrait_calibrate_summary">Adjust keyboard size, framebuffer position, etc</string>
     <string name="keyboard_glyph_scale">Keyboard glyphs scaled 2x</string>
     <string name="keyboard_glyph_scale_summary">(Makes keyboard appear less pixelated on large screens)</string>
+    <string name="crash_sigabrt">SIGABRT</string>
+    <string name="crash_sigfpe">SIGFPE</string>
+    <string name="reset">Reset</string>
+    <string name="reset_self_test">Self Test</string>
+    <string name="reset_preferences">Reset settings</string>
+    <string name="reset_soft">Soft</string>
 
 </resources>
diff --git a/Android/app/src/main/res/xml/a2backupscheme.xml b/Android/app/src/main/res/xml/a2backupscheme.xml
new file mode 100644
index 00000000..761b8012
--- /dev/null
+++ b/Android/app/src/main/res/xml/a2backupscheme.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+</full-backup-content>
\ No newline at end of file
diff --git a/Android/jni/build.sh b/Android/jni/build.sh
index 2873b469..228f1e13 100755
--- a/Android/jni/build.sh
+++ b/Android/jni/build.sh
@@ -131,7 +131,7 @@ if test "x$do_build" = "x1" -o "x$do_release" = "x1" ; then
         fi
     else
         export BUILD_MODE=release
-        ndk-build V=1 NDK_MODULE_PATH=. NDK_TOOLCHAIN_VERSION=4.9
+        ndk-build V=1 NDK_MODULE_PATH=. NDK_DEBUG=0 NDK_TOOLCHAIN_VERSION=4.9
         ret=$?
         if test "x$ret" != "x0" ; then
             exit $ret