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 /android/android.make | |
| 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 'android/android.make')
| -rw-r--r-- | android/android.make | 4 |
1 files changed, 2 insertions, 2 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 | |||
| 33 | KEYSTORE=$(HOME)/.android/debug.keystore | 33 | KEYSTORE=$(HOME)/.android/debug.keystore |
| 34 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb | 34 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb |
| 35 | 35 | ||
| 36 | MANIFEST := $(BUILDDIR)/AndroidManifest.xml | 36 | MANIFEST := $(BUILDDIR)/bin/AndroidManifest.xml |
| 37 | MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml | 37 | MANIFEST_SRC := $(ANDROID_DIR)/AndroidManifest.xml |
| 38 | 38 | ||
| 39 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java | 39 | R_JAVA := $(BUILDDIR)/gen/$(PACKAGE_PATH)/R.java |
| @@ -66,7 +66,7 @@ CLEANOBJS += bin gen libs data | |||
| 66 | JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin | 66 | JAVAC_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) |