Allow building android with java 1.7.

* Specify source and target java versions for android build
* Specify algorithms for jarsigner

Change-Id: I59d743b9e5484ac93b6f9361b1c41f9862964b0f
This commit is contained in:
Frank Gevaerts 2012-06-13 23:43:39 +02:00
parent c02bdc3c3c
commit 190577ee9d

View file

@ -78,7 +78,7 @@ RES := $(wildcard $(ANDROID_DIR)/res/*/*)
CLEANOBJS += bin gen libs data
JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(CLASSPATH)
JAVAC_OPTS += -source 1.6 -target 1.6 -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(CLASSPATH)
.PHONY:
$(MANIFEST): $(MANIFEST_SRC) $(DIRS)
@ -148,7 +148,8 @@ endif
$(SILENT)rm -f $@
$(call PRINTS,SIGN $(subst $(BUILDDIR)/,,$@))jarsigner \
-keystore "$(KEYSTORE)" -storepass "android" -keypass "android" \
-signedjar $(TEMP_APK2) $(TEMP_APK) "androiddebugkey"
-signedjar $(TEMP_APK2) $(TEMP_APK) "androiddebugkey" \
-sigalg MD5withRSA -digestalg SHA1
$(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null
$(DIRS):