diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 18:44:42 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-05-29 18:44:42 +0000 |
| commit | fc68a0d3b0d32f0f96c4dcf95bf0f29c1770976d (patch) | |
| tree | 2f372d9bf716cbc844de1311bc8498cdff0921f9 /tools | |
| parent | d7d830fa081696c407996b308626d8d6c3a09618 (diff) | |
| download | rockbox-fc68a0d3b0d32f0f96c4dcf95bf0f29c1770976d.tar.gz rockbox-fc68a0d3b0d32f0f96c4dcf95bf0f29c1770976d.zip | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/root.make | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||