Various tweaks to get release build working

This commit is contained in:
Aaron Culliney 2016-05-07 22:30:26 -07:00
parent 254e013342
commit 093c99466f
7 changed files with 24 additions and 5 deletions

View File

@ -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'
}

View File

@ -13,6 +13,7 @@
<application
android:allowBackup="true"
android:fullBackupContent="@xml/a2backupscheme"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
</full-backup-content>

View File

@ -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