[Scummvm-git-logs] scummvm master -> 47e711e501c0d67a2303a6275ccf216b788c2edb

[lephilousophe]

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

Summary:
47e711e501 ANDROID: Split assets in its own pack for AAB


Commit: 47e711e501c0d67a2303a6275ccf216b788c2edb
    https://github.com/scummvm/scummvm/commit/47e711e501c0d67a2303a6275ccf216b788c2edb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-12T22:42:22+01:00

Commit Message:
ANDROID: Split assets in its own pack for AAB

The AAB is still unique but there are several parts in it.

Changed paths:
  A dists/android/mainAssets.gradle
  A dists/android/settings.gradle
    backends/platform/android/android.mk
    dists/android/build.gradle


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 1fab17370c2..8dbdc83a5b7 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -4,8 +4,8 @@ PATH_DIST = $(srcdir)/dists/android
 GRADLE_FILES = $(shell find $(PATH_DIST)/gradle -type f)
 
 PATH_BUILD = ./android_project
-PATH_BUILD_GRADLE = $(PATH_BUILD)/gradle/.timestamp $(PATH_BUILD)/gradlew $(PATH_BUILD)/build.gradle $(PATH_BUILD)/gradle.properties $(PATH_BUILD)/local.properties $(PATH_BUILD)/src.properties
-PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
+PATH_BUILD_GRADLE = $(PATH_BUILD)/gradle/.timestamp $(PATH_BUILD)/gradlew $(PATH_BUILD)/build.gradle $(PATH_BUILD)/settings.gradle $(PATH_BUILD)/mainAssets/build.gradle $(PATH_BUILD)/gradle.properties $(PATH_BUILD)/local.properties $(PATH_BUILD)/src.properties
+PATH_BUILD_ASSETS = $(PATH_BUILD)/mainAssets/src/main/assets
 PATH_BUILD_LIB = $(PATH_BUILD)/lib/$(ABI)
 PATH_BUILD_LIBSCUMMVM = $(PATH_BUILD)/lib/$(ABI)/libscummvm.so
 
@@ -24,13 +24,16 @@ $(PATH_BUILD)/gradle/.timestamp: $(GRADLE_FILES) | $(PATH_BUILD)
 	touch "$@"
 
 $(PATH_BUILD)/gradlew: $(PATH_DIST)/gradlew | $(PATH_BUILD)
-	$(INSTALL) -c -m 755 $(PATH_DIST)/gradlew $(PATH_BUILD)
+	$(INSTALL) -c -m 755 $< $@
 
 $(PATH_BUILD)/build.gradle: $(PATH_DIST)/build.gradle | $(PATH_BUILD)
-	$(INSTALL) -c -m 644 $(PATH_DIST)/build.gradle $(PATH_BUILD)
+	$(INSTALL) -c -m 644 $< $@
+
+$(PATH_BUILD)/settings.gradle: $(PATH_DIST)/settings.gradle | $(PATH_BUILD)
+	$(INSTALL) -c -m 644 $< $@
 
 $(PATH_BUILD)/gradle.properties: $(PATH_DIST)/gradle.properties | $(PATH_BUILD)
-	$(INSTALL) -c -m 644 $(PATH_DIST)/gradle.properties $(PATH_BUILD)
+	$(INSTALL) -c -m 644 $< $@
 
 $(PATH_BUILD)/local.properties: configure.stamp | $(PATH_BUILD)
 	$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
@@ -38,6 +41,9 @@ $(PATH_BUILD)/local.properties: configure.stamp | $(PATH_BUILD)
 $(PATH_BUILD)/src.properties: configure.stamp | $(PATH_BUILD)
 	$(ECHO) "srcdir=$(realpath $(srcdir))\n" > $(PATH_BUILD)/src.properties
 
+$(PATH_BUILD)/mainAssets/build.gradle: $(PATH_DIST)/mainAssets.gradle | $(PATH_BUILD_ASSETS)
+	$(INSTALL) -c -m 644 $< $@
+
 $(PATH_BUILD_ASSETS): $(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)
 	$(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)/
@@ -72,7 +78,7 @@ $(APK_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_ASSE
 	$(CP) $(PATH_BUILD)/build/outputs/apk/release/$(APK_MAIN_RELEASE) $@
 
 $(AAB_MAIN_RELEASE): $(PATH_BUILD_GRADLE) $(PATH_BUILD_ASSETS) $(PATH_BUILD_ASSETS)/cacert.pem $(PATH_BUILD_LIBSCUMMVM) | $(PATH_BUILD)
-	(cd $(PATH_BUILD); ./gradlew bundleRelease)
+	(cd $(PATH_BUILD); ./gradlew bundleRelease -PsplitAssets)
 	$(CP) $(PATH_BUILD)/build/outputs/bundle/release/$(AAB_MAIN_RELEASE) $@
 
 all: $(APK_MAIN)
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 501837dfc5e..5f24b6ba5b7 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -109,7 +109,9 @@ android {
     }
     sourceSets {
         main {
-            assets.srcDirs 'assets/'
+            if (!project.hasProperty('splitAssets')) {
+                assets.srcDirs 'mainAssets/src/main/assets/'
+            }
             java.srcDirs srcProperties['srcdir'] + '/backends/platform/android/'
             jniLibs.srcDirs 'lib/'
             res.srcDirs srcProperties['srcdir'] + '/dists/android/res/'
@@ -119,6 +121,11 @@ android {
     lint {
         abortOnError false
     }
+
+    if (project.hasProperty('splitAssets')) {
+        assetPacks = [':mainAssets']
+    }
+
 }
 
 dependencies {
diff --git a/dists/android/mainAssets.gradle b/dists/android/mainAssets.gradle
new file mode 100644
index 00000000000..9425b4c30b8
--- /dev/null
+++ b/dists/android/mainAssets.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id 'com.android.asset-pack'
+}
+
+if (project.hasProperty('splitAssets')) {
+    assetPack {
+        packName = 'mainAssets'
+        dynamicDelivery {
+            deliveryType = 'install-time'
+        }
+    }
+}
diff --git a/dists/android/settings.gradle b/dists/android/settings.gradle
new file mode 100644
index 00000000000..2ee4eee0d99
--- /dev/null
+++ b/dists/android/settings.gradle
@@ -0,0 +1 @@
+include ':mainAssets'