diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml index 08c5dde7..fe865d33 100644 --- a/Android/.idea/gradle.xml +++ b/Android/.idea/gradle.xml @@ -6,6 +6,12 @@ diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml index 0934cac2..8b7ac1cd 100644 --- a/Android/.idea/misc.xml +++ b/Android/.idea/misc.xml @@ -1,5 +1,8 @@ + + + @@ -22,7 +25,7 @@ - + diff --git a/Android/.idea/modules.xml b/Android/.idea/modules.xml index 746019cd..28d7222e 100644 --- a/Android/.idea/modules.xml +++ b/Android/.idea/modules.xml @@ -3,6 +3,7 @@ + diff --git a/Android/Android.iml b/Android/Android.iml index 64cf30b5..7c38323e 100644 --- a/Android/Android.iml +++ b/Android/Android.iml @@ -1,22 +1,18 @@ - + - + - - - - - - + + + - - + diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml deleted file mode 100644 index 587d1c6f..00000000 --- a/Android/AndroidManifest.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml new file mode 120000 index 00000000..bdb7010f --- /dev/null +++ b/Android/AndroidManifest.xml @@ -0,0 +1 @@ +app/src/main/AndroidManifest.xml \ No newline at end of file diff --git a/Android/app/app.iml b/Android/app/app.iml new file mode 100644 index 00000000..c6c55c4e --- /dev/null +++ b/Android/app/app.iml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 42216836..350aefcd 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "org.deadc0de.apple2ix" minSdkVersion 10 - targetSdkVersion 21 + targetSdkVersion 10 versionCode 1 versionName "1.0" } diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 0a22782b..587d1c6f 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -1,9 +1,26 @@ + - - - + package="org.deadc0de.apple2ix" + android:versionCode="1" + android:versionName="1.0" > + + + + + + + + + + + - diff --git a/Android/app/src/main/assets b/Android/app/src/main/assets new file mode 120000 index 00000000..2978ef39 --- /dev/null +++ b/Android/app/src/main/assets @@ -0,0 +1 @@ +../../../assets \ No newline at end of file diff --git a/Android/src/org/deadc0de/apple2/Apple2Activity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java similarity index 100% rename from Android/src/org/deadc0de/apple2/Apple2Activity.java rename to Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java diff --git a/Android/src/org/deadc0de/apple2/Apple2View.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java similarity index 100% rename from Android/src/org/deadc0de/apple2/Apple2View.java rename to Android/app/src/main/java/org/deadc0de/apple2ix/Apple2View.java diff --git a/Android/app/src/main/jniLibs b/Android/app/src/main/jniLibs new file mode 120000 index 00000000..d63817ad --- /dev/null +++ b/Android/app/src/main/jniLibs @@ -0,0 +1 @@ +../../../libs \ No newline at end of file diff --git a/Android/build.gradle b/Android/build.gradle index 495c5038..6356aabd 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -1 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.0.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/Android/src b/Android/src new file mode 120000 index 00000000..09bdcc3d --- /dev/null +++ b/Android/src @@ -0,0 +1 @@ +app/src/main/java \ No newline at end of file