summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android/android.make4
-rw-r--r--tools/root.make2
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: ####