remove built files

Signed-off-by: Keith Packard <keithp@keithp.com>

5 files changed, 42 insertions, 72 deletions

diff --git a/Makefile b/Makefile
index 577fe1b..ac07661 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,31 @@
 SDK=/home/keithp/src/android/android-sdk-linux
+
 DX=$(SDK)/platform-tools/dx
 ADB=$(SDK)/platform-tools/adb
+AAPT=$(SDK)/platform-tools/aapt
+APKBUILDER=$(SDK)/tools/apkbuilder
+ZIPALIGN=$(SDK)/tools/zipalign
+
 PLATFORM=$(SDK)/platforms/android-10
+PLATFORM_JAR=$(PLATFORM)/android.jar
+ADDONS=$(SDK)/add-ons/addon-google_apis-google_inc_-10/libs
 TOOLS_LIB=$(SDK)/tools/lib
 CLASSPATH=".:$(PLATFORM)/*:$(TOOLS_LIB)/*"
 CLASSES=classes
-CLASSPATH_ENV=mkdir $(CLASSES); CLASSPATH=$(CLASSPATH)
 SRC_DIR=src/org/altusmetrum/AltosDroid
 GEN_DIR=gen/org/altusmetrum/AltosDroid
 JAVAC=javac
-JAVACFLAGS=-d $(CLASSES)
+BOOTCLASSPATH=$(PLATFORM_JAR):$(ADDONS)/usb.jar:$(ADDONS)/maps.jar
+
+JAVACFLAGS=\
+	-d $(CLASSES) \
+	-classpath $(CLASSES):. \
+	-sourcepath src:gen \
+	-target 1.5 \
+	-bootclasspath $(BOOTCLASSPATH) \
+	-encoding UTF-8 \
+	-g \
+	-source 1.5
 
 SRC=\
 	$(SRC_DIR)/AltosDroid.java \
@@ -20,11 +36,31 @@ SRC=\
 all: class.stamp AltosDroid.apk
 
 class.stamp: $(SRC)
-	$(CLASSPATH_ENV) $(JAVAC) $(JAVACFLAGS) $(SRC) && touch class.stamp
+	$(JAVAC) $(JAVACFLAGS) $(SRC) && touch $@
 
-AltosDroid.apk: class.stamp
-	$(DX) --dex --verbose --output=$@ AndroidManifest.xml $(CLASSES) && \
-	jarsigner -keystore ./keystore -storepass altusmetrum $@ bob
+AltosDroid.dex: class.stamp
+	$(DX) --dex --verbose --output=$@ $(CLASSES)
+
+AltosDroid.apk: AltosDroid.dex
+	$(APKBUILDER) "$@" -u -f AltosDroid.dex
 
 install: AltosDroid.apk
 	$(ADB) -e install -r AltosDroid.apk
+
+$(GEN_DIR)/R.java: resources.stamp
+
+resources.stamp: Makefile
+	mkdir -p bin/res
+	$(AAPT) package -f -m -M AndroidManifest.xml -S bin/res -S res -I $(PLATFORM_JAR) -J gen --generate-dependencies && touch $@
+
+dex.stamp: Makefile class.stamp
+	$(DX) --dex --output bin/classes.dex bin/classes && touch $@
+
+crunch.stamp: Makefile dex.stamp
+	$(AAPT) crunch -v -S res -C bin/res
+
+package.stamp: Makefile crunch.stamp
+	$(AAPT) package --no-crunch -f --debug-mode -M AndroidManifest.xml -S bin/res -S res -A assets -I $(PLATFORM_JAR) -F bin/activity.ap_ --generate-dependencies && touch $@
+
+align.stamp: Makefile package.stamp
+	$(ZIPALIGN) -f 4 bin/activity-debug-unaligned.apk bin/activity-debug.apk
\ No newline at end of file
diff --git a/bin/AltosDroid.apk b/bin/AltosDroid.apk
deleted file mode 100644
index 56e7bb9..0000000
--- a/bin/AltosDroid.apk
+++ /dev/null
diff --git a/bin/classes.dex b/bin/classes.dex
deleted file mode 100644
index f53c2a0..0000000
--- a/bin/classes.dex
+++ /dev/null
diff --git a/bin/resources.ap_ b/bin/resources.ap_
deleted file mode 100644
index cf01206..0000000
--- a/bin/resources.ap_
+++ /dev/null
diff --git a/gen/org/altusmetrum/AltosDroid/R.java b/gen/org/altusmetrum/AltosDroid/R.java
deleted file mode 100644
index 66f3449..0000000
--- a/gen/org/altusmetrum/AltosDroid/R.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package org.altusmetrum.AltosDroid;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int app_icon=0x7f020000;
-    }
-    public static final class id {
-        public static final int button_scan=0x7f060006;
-        public static final int button_send=0x7f060009;
-        public static final int discoverable=0x7f06000c;
-        public static final int edit_text_out=0x7f060008;
-        public static final int in=0x7f060007;
-        public static final int insecure_connect_scan=0x7f06000b;
-        public static final int new_devices=0x7f060005;
-        public static final int paired_devices=0x7f060003;
-        public static final int secure_connect_scan=0x7f06000a;
-        public static final int title_left_text=0x7f060000;
-        public static final int title_new_devices=0x7f060004;
-        public static final int title_paired_devices=0x7f060002;
-        public static final int title_right_text=0x7f060001;
-    }
-    public static final class layout {
-        public static final int custom_title=0x7f030000;
-        public static final int device_list=0x7f030001;
-        public static final int device_name=0x7f030002;
-        public static final int main=0x7f030003;
-        public static final int message=0x7f030004;
-    }
-    public static final class menu {
-        public static final int option_menu=0x7f050000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int bt_not_enabled_leaving=0x7f040003;
-        public static final int button_scan=0x7f04000d;
-        public static final int discoverable=0x7f040010;
-        public static final int insecure_connect=0x7f04000f;
-        public static final int none_found=0x7f04000a;
-        public static final int none_paired=0x7f040009;
-        public static final int not_connected=0x7f040002;
-        /**   DeviceListActivity 
-         */
-        public static final int scanning=0x7f040007;
-        /**  Options Menu 
-         */
-        public static final int secure_connect=0x7f04000e;
-        public static final int select_device=0x7f040008;
-        /**   BluetoothChat 
-         */
-        public static final int send=0x7f040001;
-        public static final int title_connected_to=0x7f040005;
-        public static final int title_connecting=0x7f040004;
-        public static final int title_not_connected=0x7f040006;
-        public static final int title_other_devices=0x7f04000c;
-        public static final int title_paired_devices=0x7f04000b;
-    }
-}