From fc68a0d3b0d32f0f96c4dcf95bf0f29c1770976d Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 29 May 2011 18:44:42 +0000 Subject: [PATCH] Android: rework r29929 AndroidManifest.xml version handling. Put the generated AndroidManifest.xml into the bin subfolder and remove it from clean list. Avoids problems with cleaning if you're building in the android/ folder. Thanks to kugel for pointing out that people are actually doing that. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29931 a1c6a512-1295-4272-9138-f99709370657 --- android/android.make | 4 ++-- tools/root.make | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/android.make b/android/android.make index d68a81635a..fa3b48eaf8 100644 --- a/android/android.make +++ b/android/android.make @@ -33,7 +33,7 @@ ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign KEYSTORE=$(HOME)/.android/debug.keystore ADB=$(ANDROID_SDK_PATH)/platform-tools/adb -MANIFEST := $(BUILDDIR)/AndroidManifest.xml +MANIFEST := $(BUILDDIR)/bin/AndroidManifest.xml MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java @@ -66,7 +66,7 @@ CLEANOBJS += bin gen libs data JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin .PHONY: -$(MANIFEST): $(MANIFEST_SRC) +$(MANIFEST): $(MANIFEST_SRC) $(DIRS) $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST) $(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS) diff --git a/tools/root.make b/tools/root.make index 9cf9eef1d0..1ac5568316 100644 --- a/tools/root.make +++ b/tools/root.make @@ -148,7 +148,7 @@ clean:: $(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \ make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \ $(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK) \ - rockbox.apk AndroidManifest.xml + rockbox.apk #### linking the binaries: ####