From 121c693a1378c18e40ca4935fd047e9caca6e136 Mon Sep 17 00:00:00 2001 From: Spoike Date: Thu, 2 Feb 2012 04:19:24 +0000 Subject: [PATCH] use SDK level 8's tools and java classes, in order to support additional features (app-on-sd and multitouch). Should still run on droid 1.6+. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3971 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index a78ee0ac4..60923ed8a 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1180,8 +1180,8 @@ distclean: clean #makes an ant project for us droid/build.xml: - -cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android update project -t 1 -p . -n FTEDroid - -cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android.bat update project -t 1 -p . -n FTEDroid + -cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android update project -t android-8 -p . -n FTEDroid + -cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android.bat update project -t android-8 -p . -n FTEDroid #build FTE as a library, then build the java+package (release) droid/ftekeystore: @@ -1218,7 +1218,7 @@ endif @echo @echo Signing package... I hope you remember your password. @echo - $(JAVATOOL)jarsigner $(JARSIGNARGS) -digestalg SHA1 -sigalg MD5withRSA -keystore droid/ftekeystore droid/bin/FTEDroid-release-unsigned.apk autogen + @$(JAVATOOL)jarsigner $(JARSIGNARGS) -digestalg SHA1 -sigalg MD5withRSA -keystore droid/ftekeystore droid/bin/FTEDroid-release-unsigned.apk autogen -rm -f $(RELEASE_DIR)/FTEDroid.apk $(DROID_SDK_PATH)/tools/zipalign 4 droid/bin/FTEDroid-release-unsigned.apk $(RELEASE_DIR)/FTEDroid.apk