diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 17:23:52 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 17:23:52 +0000 |
commit | bc3f9c1b71bdf15e80e80b6aa41a4e39a258ba82 (patch) | |
tree | 27e962fdcd7bd432cadf49ee271910ecbae2f769 /android/android.make | |
parent | ee7cbf6d4a2eb3d48a18c96eeb038c3a5184debc (diff) | |
download | rockbox-bc3f9c1b71bdf15e80e80b6aa41a4e39a258ba82.tar.gz rockbox-bc3f9c1b71bdf15e80e80b6aa41a4e39a258ba82.zip |
Add source tree version into AndroidManifest.xml
Use the source tree version as versionName string. As result the Android
Settings menu will now show that version instead of a rather unhelpful "1.0".
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29929 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/android.make')
-rw-r--r-- | android/android.make | 7 |
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 | |||
33 | KEYSTORE=$(HOME)/.android/debug.keystore | 33 | KEYSTORE=$(HOME)/.android/debug.keystore |
34 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb | 34 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb |
35 | 35 | ||
36 | MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml | 36 | MANIFEST := $(BUILDDIR)/AndroidManifest.xml |
37 | MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml | ||
37 | 38 | ||
38 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java | 39 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java |
39 | R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class | 40 | R_OBJ := $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class |
@@ -64,6 +65,10 @@ CLEANOBJS += bin gen libs data | |||
64 | 65 | ||
65 | JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin | 66 | JAVAC_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 \ |