len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The zip target isn't a good prerequisite for another make target so remove it.

Browse source 
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
This commit is contained in:
Thomas Martitz 2010-09-12 20:50:30 +00:00
parent 51c91c599b
commit aa0f895572
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
android/android.make
View file

@ -75,15 +75,14 @@ dex: $(DEX)
$(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY) $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
$(call PRINTS,CP $(BINARY))cp $^ $@ $(call PRINTS,CP $(BINARY))cp $^ $@
$(BUILDDIR)/_rockbox.zip: zip $(BUILDDIR)/rockbox.zip:
$(SILENT)mv $(BUILDDIR)/rockbox.zip $@
$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/_rockbox.zip $(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
$(call PRINTS,CP rockbox.zip)cp $^ $@ $(call PRINTS,CP rockbox.zip)cp $^ $@
libs: $(LIBS) libs: $(LIBS)
$(TEMP_APK): libs dex $(TEMP_APK): $(LIBS) $(DEX)
$(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \ $(call PRINTS,APK $(subst $(BUILDDIR)/,,$@))$(APKBUILDER) $@ \
-u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs -u -z $(AP_) -f $(DEX) -nf $(BUILDDIR)/libs
@ -95,10 +94,12 @@ $(APK): $(TEMP_APK)
$(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null $(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null
$(SILENT)rm $(TEMP_APK) $(TEMP_APK2) $(SILENT)rm $(TEMP_APK) $(TEMP_APK2)
dirs: $(DIRS):
$(SILENT)mkdir -p $(DIRS) $(SILENT)mkdir -p $@
apk: dirs $(APK) dirs: $(DIRS)
apk: $(DIRS) $(APK)
clean:: clean::
$(SILENT)rm -f $(BUILDDIR)/bin/$(PACKAGE_PATH)/*.class $(R_JAVA) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_) $(LIBS) $(SILENT)rm -f $(BUILDDIR)/bin/$(PACKAGE_PATH)/*.class $(R_JAVA) $(TEMP_APK) $(TEMP_APK2) $(APK) $(DEX) $(BUILDDIR)/_rockbox.zip $(AP_) $(LIBS)