Merge pull request godotengine#106604 from m4gr3d/fix_aab_regression

Update to the AAB directory layout

Author: Repiteo

platform/android/export/export_plugin.cpp

@@ -279,7 +279,7 @@ static const int EXPORT_FORMAT_APK = 0;
 static const int EXPORT_FORMAT_AAB = 1;
 
 static const char *APK_ASSETS_DIRECTORY = "assets";
-static const char *AAB_ASSETS_DIRECTORY = "assetPacks/installTime/src/main/assets";
+static const char *AAB_ASSETS_DIRECTORY = "assetPackInstallTime/src/main/assets";
 
 static const int DEFAULT_MIN_SDK_VERSION = 24; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
 static const int DEFAULT_TARGET_SDK_VERSION = 35; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'

…/app/assetPacks/installTime/build.gradle …va/app/assetPackInstallTime/build.gradleplatform/android/java/app/assetPacks/installTime/build.gradle renamed to platform/android/java/app/assetPackInstallTime/build.gradle platform/android/java/app/assetPacks/installTime/build.gradle renamed to platform/android/java/app/assetPackInstallTime/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 assetPack {
-    packName = "installTime" // Directory name for the asset pack
+    packName = "assetPackInstallTime" // Directory name for the asset pack
     dynamicDelivery {
         deliveryType = "install-time" // Delivery mode
     }

platform/android/java/app/build.gradle

@@ -90,7 +90,7 @@ android {
         jvmTarget = versions.javaVersion
     }
 
-    assetPacks = [":assetPacksInstallTime"]
+    assetPacks = [":assetPackInstallTime"]
 
     namespace = 'com.godot.game'
 

platform/android/java/app/settings.gradle

@@ -15,5 +15,4 @@ pluginManagement {
     }
 }
 
-include ':assetPacksInstallTime'
-project(':assetPacksInstallTime').projectDir = file("assetPacks/installTime")
+include ':assetPackInstallTime'

platform/android/java/settings.gradle

@@ -25,5 +25,5 @@ include ':lib'
 include ':nativeSrcsConfigs'
 include ':editor'
 
-include ':assetPacksInstallTime'
-project(':assetPacksInstallTime').projectDir = file("app/assetPacks/installTime")
+include ':assetPackInstallTime'
+project(':assetPackInstallTime').projectDir = file("app/assetPackInstallTime")