summaryrefslogtreecommitdiff
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
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 := $(BUILDDIR)/AndroidManifest.xml 36MANIFEST := $(BUILDDIR)/bin/AndroidManifest.xml
37MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml 37MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml
38 38
39R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java 39R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java
@@ -66,7 +66,7 @@ CLEANOBJS += bin gen libs data
66JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin 66JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin
67 67
68.PHONY: 68.PHONY:
69$(MANIFEST): $(MANIFEST_SRC) 69$(MANIFEST): $(MANIFEST_SRC) $(DIRS)
70 $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST) 70 $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST)
71 71
72$(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS) 72$(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::
148 $(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \ 148 $(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \
149 make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \ 149 make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \
150 $(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK) \ 150 $(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK) \
151 rockbox.apk AndroidManifest.xml 151 rockbox.apk
152 152
153#### linking the binaries: #### 153#### linking the binaries: ####
154 154