From 8b58568246d3f42299b68246b40c35bf04488dc5 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Mon, 27 Oct 2014 23:46:33 +0000 Subject: [PATCH] Update makefile for version 20 - Change build tools folder to version 20 - Change .dbg extension to -dbg.apk because ADB refuses to install packages with different extensions --- makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 94988d6..3df37e2 100644 --- a/makefile +++ b/makefile @@ -8,7 +8,7 @@ KEYTYPE ?= pkcs12 KEYNAME ?= android ANDROID ?= /opt/android-sdk-update-manager/platforms/android-18/android.jar SDKLIB ?= /opt/android-sdk-update-manager/tools/lib/sdklib.jar -TOOLS ?= /opt/android-sdk-update-manager/build-tools/19.0.1 +TOOLS ?= /opt/android-sdk-update-manager/build-tools/20.0.0 # Variables PATH := $(PATH):$(TOOLS) @@ -21,7 +21,7 @@ APK := java -classpath $(SDKLIB) \ com.android.sdklib.build.ApkBuilderMain # Targets -debug: bin/$(PROGRAM).dbg +debug: bin/$(PROGRAM)-dbg.apk release: bin/$(PROGRAM).apk @@ -39,7 +39,7 @@ run: bin/install.stamp -a android.intent.action.MAIN \ -n $(PACKAGE)/.Main -install bin/install.stamp: bin/$(PROGRAM).dbg +install bin/install.stamp: bin/$(PROGRAM)-dbg.apk adb install -r $+ touch bin/install.stamp @@ -76,7 +76,7 @@ convert: done # Rules -%.dbg: %.dex %.res | bin +%-dbg.apk: %.dex %.res | bin @echo "APK $@.in" @$(APK) $@.in -f $*.dex -z $*.res @echo "ALIGN $@" -- 2.43.2