[Scummvm-cvs-logs] scummvm master -> 2d92259b70b2c7b72e8caf5140714f7252053c85

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
201336367b ANDROID: disable compression for zip-file assets and recompress uncompressed zip-files before adding them as assets to t
2d92259b70 Merge pull request #235 from tobigun/android-theme


Commit: 201336367b2e864b960966568df0a472efdbe1e5
    https://github.com/scummvm/scummvm/commit/201336367b2e864b960966568df0a472efdbe1e5
Author: Tobias Gunkel (Tobias.Gunkel at gmx.de)
Date: 2012-04-29T08:23:07-07:00

Commit Message:
ANDROID: disable compression for zip-file assets and recompress uncompressed zip-files before adding them as assets to the apk

Changed paths:
    backends/platform/android/android.mk



diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 2e8fd62..9292a16 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -130,7 +130,18 @@ $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png: $(PATH_RESOURCES)/drawable/scum
 $(FILE_RESOURCES_MAIN): $(FILE_MANIFEST) $(RESOURCES) $(ANDROID_JAR8) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/
-	$(AAPT) package -f -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR8) -F $@
+	work_dir=`pwd`; \
+	for i in $(PATH_BUILD_ASSETS)/*.zip; do \
+		echo "recompress $$i"; \
+		cd $$work_dir; \
+		$(RM) -rf $(PATH_BUILD_ASSETS)/tmp; \
+		$(MKDIR) $(PATH_BUILD_ASSETS)/tmp; \
+		unzip -q $$i -d $(PATH_BUILD_ASSETS)/tmp; \
+		cd $(PATH_BUILD_ASSETS)/tmp; \
+		zip -r ../`basename $$i` *; \
+	done
+	@$(RM) -rf $(PATH_BUILD_ASSETS)/tmp
+	$(AAPT) package -f -0 zip -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR8) -F $@
 
 $(PATH_BUILD)/%/$(FILE_RESOURCES): $(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png plugins/lib%.so $(ANDROID_JAR8)
 	$(AAPT) package -f -M $< -S $(PATH_STAGE_PREFIX).$*/res -I $(ANDROID_JAR8) -F $@


Commit: 2d92259b70b2c7b72e8caf5140714f7252053c85
    https://github.com/scummvm/scummvm/commit/2d92259b70b2c7b72e8caf5140714f7252053c85
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2012-07-06T13:19:00-07:00

Commit Message:
Merge pull request #235 from tobigun/android-theme

ANDROID: disable compression for zip-file assets

Changed paths:
    backends/platform/android/android.mk