summaryrefslogtreecommitdiffstats
path: root/android/android.make
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2010-09-24 12:03:15 +0000
committerBjörn Stenberg <bjorn@haxx.se>2010-09-24 12:03:15 +0000
commita8ed339ba573e48b82d0fdda348a748e142f803d (patch)
tree0da6f943aa977339b2da6edada5343db7076165a /android/android.make
parent7b68b7e9dc7315818c7c295b8839d6e023d72a2c (diff)
downloadrockbox-a8ed339ba573e48b82d0fdda348a748e142f803d.tar.gz
rockbox-a8ed339ba573e48b82d0fdda348a748e142f803d.tar.bz2
rockbox-a8ed339ba573e48b82d0fdda348a748e142f803d.zip
Minor build script tweaks to make android auto-buildable.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28156 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/android.make')
-rw-r--r--android/android.make11
1 files changed, 5 insertions, 6 deletions
diff --git a/android/android.make b/android/android.make
index f611d5d5a1..492c0127cb 100644
--- a/android/android.make
+++ b/android/android.make
@@ -41,11 +41,11 @@ JAVA_SRC := $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java)
JAVA_OBJ := $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC)))
LIBS := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so
-TEMP_APK := $(BUILDDIR)/bin/_Rockbox.apk
-TEMP_APK2 := $(BUILDDIR)/bin/__Rockbox.apk
+TEMP_APK := $(BUILDDIR)/bin/_rockbox.apk
+TEMP_APK2 := $(BUILDDIR)/bin/__rockbox.apk
DEX := $(BUILDDIR)/bin/classes.dex
AP_ := $(BUILDDIR)/bin/resources.ap_
-APK := $(BUILDDIR)/bin/Rockbox.apk
+APK := $(BUILDDIR)/rockbox.apk
_DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH)
DIRS := $(subst ___,bin,$(_DIRS))
@@ -53,6 +53,8 @@ DIRS += $(subst ___,gen,$(_DIRS))
DIRS += $(subst ___,data,$(_DIRS))
DIRS += $(BUILDDIR)/libs/armeabi
+CLEANOBJS += bin gen libs data
+
$(R_JAVA) $(AP_): $(MANIFEST)
$(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \
-J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \
@@ -106,6 +108,3 @@ $(DIRS):
dirs: $(DIRS)
apk: $(APK)
-
-clean::
- $(SILENT)rm -f $(BUILDDIR)/bin/$(PACKAGE_PATH)/*.class $(R_JAVA) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_) $(LIBS)