[Scummvm-git-logs] scummvm master -> 05dcaf9737da886ab9956224b1796c0eb0a8bef8

[bluegr]

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

Summary:
05dcaf9737 ANDROID: Extract doc outside of the assets folder


Commit: 05dcaf9737da886ab9956224b1796c0eb0a8bef8
    https://github.com/scummvm/scummvm/commit/05dcaf9737da886ab9956224b1796c0eb0a8bef8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-05-03T12:52:39+03:00

Commit Message:
ANDROID: Extract doc outside of the assets folder

This avoids these files to be picked up by our search code.

Changed paths:
    backends/platform/android/android.mk
    backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 99184d7120a..af17cb1007d 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -47,7 +47,7 @@ $(PATH_BUILD)/mainAssets/build.gradle: $(PATH_DIST)/mainAssets.gradle | $(PATH_B
 
 $(PATH_BUILD_ASSETS)/MD5SUMS: config.mk $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_PLATFORM) $(DIST_FILES_SHADERS) | $(PATH_BUILD)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)/assets/
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(DIST_FILES_PLATFORM) $(PATH_BUILD_ASSETS)/assets/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_ENGINEDATA_BIG) $(DIST_FILES_SOUNDFONTS) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_PLATFORM) $(PATH_BUILD_ASSETS)/assets/
 ifneq ($(DIST_FILES_SHADERS),)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)/assets/shaders
 	$(INSTALL) -c -m 644 $(DIST_FILES_SHADERS) $(PATH_BUILD_ASSETS)/assets/shaders
@@ -56,7 +56,9 @@ ifneq ($(GAMES_BUNDLE_DIRECTORY),)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)/assets/games
 	$(CP) -r $(GAMES_BUNDLE_DIRECTORY)/. $(PATH_BUILD_ASSETS)/assets/games/
 endif
-	(cd $(PATH_BUILD_ASSETS)/ && find assets -type f | sort | xargs md5sum) > $@
+	$(INSTALL) -d $(PATH_BUILD_ASSETS)/doc/
+	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(PATH_BUILD_ASSETS)/doc/
+	(cd $(PATH_BUILD_ASSETS)/ && find assets doc -type f | sort | xargs md5sum) > $@
 
 ifdef DIST_ANDROID_CACERT_PEM
 $(PATH_BUILD_ASSETS)/assets/cacert.pem: $(DIST_ANDROID_CACERT_PEM)
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 317368e0e59..b39a8426246 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -2277,6 +2277,7 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 		// Continue: with extracting the whole assets
 		try {
 			extractAssets(assetManager, "assets", new File(_actualScummVMDataDir, "assets"));
+			extractAssets(assetManager, "doc", new File(_actualScummVMDataDir, "doc"));
 		} catch (IOException e) {
 			Log.e(ScummVM.LOG_TAG, "An error happened while extracting the assets");
 			// Don't write the new MD5SUMS: we did not finish our work well