X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=dc3d20adf012480b46984178b6a0d511b26b7287;hb=8e493d3ac16f0845182263630d4a5acf9ad66cf5;hp=198e745fd3372708b93208090f8967ac941e4841;hpb=e07b443c888201c4097f9d2ac037cc752a20cdf3;p=~andy%2Fspades

diff --git a/makefile b/makefile
index 198e745..dc3d20a 100644
--- a/makefile
+++ b/makefile
@@ -7,6 +7,7 @@ KEYFILE ?= ~/.android/android.p12
 KEYTYPE ?= pkcs12
 KEYNAME ?= android
 ANDROID ?= /opt/android-sdk-update-manager/platforms/android-10/android.jar
+SDKLIB  ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar
 
 # Variables
 DIR     := $(subst .,/,$(PACKAGE))
@@ -14,6 +15,8 @@ RES     := $(wildcard res/*/*.*)
 SRC     := $(wildcard src/$(DIR)/*.java)
 GEN     := gen/$(DIR)/R.java
 OBJ     := obj/$(DIR)/R.class
+APK     := java -classpath $(SDKLIB) \
+                com.android.sdklib.build.ApkBuilderMain
 
 # Targets
 debug: bin/$(PROGRAM).dbg
@@ -70,13 +73,13 @@ convert:
 # Rules
 %.dbg: %.dex %.res | bin
 	@echo "APK    $@.in"
-	@apkbuilder $@.in -f $*.dex -z $*.res
+	@$(APK) $@.in -f $*.dex -z $*.res
 	@echo "ALIGN  $@"
 	@zipalign -f 4 $@.in $@
 
 %.apk: %.dex %.res | bin
 	@echo "APKU   $@.in"
-	@apkbuilder $@.in -u -f $*.dex -z $*.res
+	@$(APK) $@.in -u -f $*.dex -z $*.res
 	@echo "SIGN   $@.in"
 	@jarsigner -storetype $(KEYTYPE)  \
 	           -keystore  $(KEYFILE)  \