Updates to prepare/support Android Studio / Gradle builds

.gitignore

@@ -43,16 +43,19 @@ ylwrap
 apple2ix*.tar.gz
 test-driver
 
+# GDB
+.gdb_history
+
 # generated sources
 src/rom.c
 src/x86/glue.S
-src/meta/debug.c
+src/arm/glue.S
 
 # sub{tree,module}
 src/rom
 
 # generated binaries
-apple2ix
+/apple2ix
 genfont
 genrom
 
@@ -65,11 +68,16 @@ xcuserdata
 .DS_Store
 xcshareddata
 
-# Android builds
+# Android CLI builds
 Android/bin
 Android/gen
 Android/libs
-
 # Android.mk is tEh dynamicz!
 Android/jni/Android.mk
 
+# Android Studio
+.gradle
+Android/local.properties
+Android/.idea/workspace.xml
+Android/.idea/libraries
+Android/build

Android/jni/apple2ix

@@ -0,0 +1 @@
+build.sh

Android/jni/apple2ix-src

@@ -0,0 +1 @@
+../../src

Android/jni/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 package_id="org.deadc0de.apple2"
-apple2_src_path=../../src
+apple2_src_path=apple2ix-src
 glue_srcs="$apple2_src_path/disk.c $apple2_src_path/misc.c $apple2_src_path/display.c $apple2_src_path/vm.c $apple2_src_path/cpu-supp.c"
 do_load=0
 do_debug=0

Android/jni/sources.mk

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 # Common emulator sources and build settings
 
-APPLE2_SRC_PATH := ../../src
+APPLE2_SRC_PATH := apple2ix-src
 
 APPLE2_X86_SRC := \
     $(APPLE2_SRC_PATH)/x86/glue.S $(APPLE2_SRC_PATH)/x86/cpu.S

Android/local.properties

@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/asc/Android/Sdk