From 721ae9a3b850735bda711946c593a38e431c5fde Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 30 Oct 2013 01:31:08 +0000
Subject: [PATCH] Fix apkbuilder error

---
 makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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)  \
-- 
2.43.2