Common baseline for CLI and Android Studio builds

- CLI is still super useful for GDB debugging and running emulator testcases
    - Possibly this maintenance of two build systems can all go away when Android Studio has better NDK support

Android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.deadc0de.apple2ix" >
+    package="org.deadc0de.apple2ix.basic" >
 
     <uses-permission android:name="android.permission.INTERNET" />
 

Android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.deadc0de.apple2ix" >
+    package="org.deadc0de.apple2ix.basic" >
 
     <uses-feature android:glEsVersion="0x00020000" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -16,7 +16,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
-            android:name=".Apple2Activity"
+            android:name="org.deadc0de.apple2ix.Apple2Activity"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation"
             android:screenOrientation="sensorLandscape"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java

@@ -29,6 +29,8 @@ import android.widget.ListView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public abstract class Apple2AbstractMenu implements Apple2MenuView {
 
     private final static String TAG = "Apple2AbstractMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java

@@ -29,6 +29,9 @@ import android.widget.FrameLayout;
 
 import java.util.ArrayList;
 
+import org.deadc0de.apple2ix.basic.BuildConfig;
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2Activity extends Activity {
 
     private final static String TAG = "Apple2Activity";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AudioSettingsMenu.java

@@ -16,6 +16,8 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2AudioSettingsMenu extends Apple2AbstractMenu {
 
     private final static String TAG = "Apple2AudioSettingsMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java

@@ -42,6 +42,8 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2DisksMenu implements Apple2MenuView {
 
     private final static String TAG = "Apple2DisksMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java

@@ -12,11 +12,12 @@
 package org.deadc0de.apple2ix;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.SeekBar;
 
+import org.deadc0de.apple2ix.basic.R;
+
 import java.util.ArrayList;
 
 public class Apple2JoystickCalibration implements Apple2MenuView {

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickSettingsMenu.java

@@ -18,6 +18,8 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2JoystickSettingsMenu extends Apple2AbstractMenu {
 
     private final static String TAG = "Apple2JoystickSettingsMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeyboardSettingsMenu.java

@@ -20,6 +20,8 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.util.Arrays;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2KeyboardSettingsMenu extends Apple2AbstractMenu {
 
     private final static String TAG = "Apple2KeyboardSettingsMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java

@@ -13,7 +13,6 @@ package org.deadc0de.apple2ix;
 
 import android.content.Context;
 import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -22,6 +21,8 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2KeypadChooser implements Apple2MenuView {
 
     private final static String TAG = "Apple2KeypadChooser";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadSettingsMenu.java

@@ -16,6 +16,8 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2KeypadSettingsMenu extends Apple2AbstractMenu {
 
     private final static String TAG = "Apple2KeypadSettingsMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java

@@ -26,6 +26,8 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2MainMenu {
 
     private final static int MENU_INSET = 20;

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java

@@ -18,6 +18,8 @@ import android.util.Log;
 
 import java.io.File;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public enum Apple2Preferences {
     FIRST_TIME_CONFIGURED {
         @Override

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java

@@ -20,6 +20,8 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
+import org.deadc0de.apple2ix.basic.R;
+
 public class Apple2SettingsMenu extends Apple2AbstractMenu {
 
     private final static String TAG = "Apple2SettingsMenu";

Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java

@@ -12,11 +12,11 @@
 package org.deadc0de.apple2ix;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
-import android.widget.ImageView;
+
+import org.deadc0de.apple2ix.basic.R;
 
 public class Apple2SplashScreen implements Apple2MenuView {
 

Android/jni/build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-package_id="org.deadc0de.apple2ix"
+package_id="org.deadc0de.apple2ix.basic"
 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 $apple2_src_path/audio/speaker.c $apple2_src_path/audio/mockingboard.c"
 do_load=0

Android/project.properties

@@ -10,5 +10,10 @@
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
+# Include appcompat stuff -- awesome that you apparently need to specify relative paths, GJ some anonymous ant =P
+#android.library.reference.1=${sdk.dir}/extras/android/support/v7/appcompat
+android.library.reference.1=../../../../Android/Sdk/extras/android/support/v7/appcompat
+
 # Project target.
-target=android-10
+##target=android-10
+target=android-23