summaryrefslogtreecommitdiffstats
path: root/android/android.make
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-09-12 20:50:30 +0000
committerThomas Martitz <kugel@rockbox.org>2010-09-12 20:50:30 +0000
commitaa0f895572237c57e05d23c18bd2be0739e0f2ba (patch)
tree354ca0a1146077bef98aae484e476d969af1e21a /android/android.make
parent51c91c599be824dee5315739600253aec7fabbc6 (diff)
downloadrockbox-aa0f895572237c57e05d23c18bd2be0739e0f2ba.tar.gz
rockbox-aa0f895572237c57e05d23c18bd2be0739e0f2ba.tar.bz2
rockbox-aa0f895572237c57e05d23c18bd2be0739e0f2ba.zip
The zip target isn't a good prerequisite for another make target so remove it.
zip has no prerequisites, so it's always made, which leads to targets depending on zip to be also always made. In the end that means that libmisc.so is always unzipped even if it didn't change. OTOH it means that make zip is now needed explicitly; so it now goes like 'make && make zip && make apk git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28068 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/android.make')
-rw-r--r--android/android.make15
1 files changed, 8 insertions, 7 deletions
diff --git a/android/android.make b/android/android.make
index a2ed996fa4..35596600a8 100644
--- a/android/android.make
+++ b/android/android.make
@@ -75,15 +75,14 @@ dex: $(DEX)
$(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
$(call PRINTS,CP $(BINARY))cp $^ $@
-$(BUILDDIR)/_rockbox.zip: zip
- $(SILENT)mv $(BUILDDIR)/rockbox.zip $@
+$(BUILDDIR)/rockbox.zip:
-$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/_rockbox.zip
+$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
$(call PRINTS,CP rockbox.zip)cp $^ $@
libs: $(LIBS)
-$(TEMP_APK): libs dex
+$(TEMP_APK): $(LIBS) $(DEX)
$(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \
-u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs
@@ -95,10 +94,12 @@ $(APK): $(TEMP_APK)
$(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null
$(SILENT)rm $(TEMP_APK) $(TEMP_APK2)
-dirs:
- $(SILENT)mkdir -p $(DIRS)
+$(DIRS):
+ $(SILENT)mkdir -p $@
-apk: dirs $(APK)
+dirs: $(DIRS)
+
+apk: $(DIRS) $(APK)
clean::
$(SILENT)rm -f $(BUILDDIR)/bin/$(PACKAGE_PATH)/*.class $(R_JAVA) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_) $(LIBS)