Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Android: rework r29929 AndroidManifest.xml version handling.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2011-05-29 18:44:42 +00:00
parent d7d830fa08
commit fc68a0d3b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/android.make
View file

@ -33,7 +33,7 @@ ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
KEYSTORE=$(HOME)/.android/debug.keystore KEYSTORE=$(HOME)/.android/debug.keystore
ADB=$(ANDROID_SDK_PATH)/platform-tools/adb ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
MANIFEST := $(BUILDDIR)/AndroidManifest.xml MANIFEST := $(BUILDDIR)/bin/AndroidManifest.xml
MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml
R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java 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 JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin
.PHONY: .PHONY:
$(MANIFEST): $(MANIFEST_SRC) $(MANIFEST): $(MANIFEST_SRC) $(DIRS)
$(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST) $(call PRINTS,MANIFEST $(@F))sed -e 's/versionName="1.0"/versionName="$(SVNVERSION)"/' $(MANIFEST_SRC) > $(MANIFEST)
$(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS) $(R_JAVA) $(AP_): $(MANIFEST) $(RES) | $(DIRS)

2
tools/root.make
View file

@ -148,7 +148,7 @@ clean::
$(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \ $(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \
make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \ make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \
$(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK) \ $(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK) \
rockbox.apk AndroidManifest.xml rockbox.apk
#### linking the binaries: #### #### linking the binaries: ####