summaryrefslogtreecommitdiff
path: root/android/android.make
diff options
context:
space:
mode:
Diffstat (limited to 'android/android.make')
-rw-r--r--android/android.make7
1 files changed, 6 insertions, 1 deletions
diff --git a/android/android.make b/android/android.make
index 109eb61d2e..d68a81635a 100644
--- a/android/android.make
+++ b/android/android.make
@@ -33,7 +33,8 @@ ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
33KEYSTORE=$(HOME)/.android/debug.keystore 33KEYSTORE=$(HOME)/.android/debug.keystore
34ADB=$(ANDROID_SDK_PATH)/platform-tools/adb 34ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
35 35
36MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml 36MANIFEST := $(BUILDDIR)/AndroidManifest.xml
37MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml
37 38
38R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java 39R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java
39R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class 40R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class
@@ -64,6 +65,10 @@ CLEANOBJS += bin gen libs data
64 65
65JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin 66JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin
66 67
68.PHONY:
69$(MANIFEST): $(MANIFEST_SRC)
70 $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST)
71
67$(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS) 72$(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS)
68 $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ 73 $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \
69 -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \ 74 -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \