Merge pull request #2215 from ericoporto/fix-dont-compress-android

Fix: don't compress `.ags` and `.vox` in android assets
adventuregamestudio · Nov 9, 2023 · 8dfc510 · 8dfc510
2 parents 2f02b31 + 285da8f
commit 8dfc510
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/Android/agsplayer/build.gradle b/Android/agsplayer/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -23,4 +23,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/Android/library/runtime/build.gradle b/Android/library/runtime/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.1"
+        classpath "com.android.tools.build:gradle:8.1.3"
     }
 }
 

diff --git a/Android/mygame/app/build.gradle b/Android/mygame/app/build.gradle
@@ -26,6 +26,10 @@ android {
         versionName projectProperties['versionName']
     }
 
+    androidResources {
+        noCompress = ['ags', 'vox']
+    }
+
     signingConfigs {
         release {
             storeFile file(keyStoreProperties['storeFile'])

diff --git a/Android/mygame/build.gradle b/Android/mygame/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
@@ -199,7 +199,7 @@ if(ANDROID)
 endif()
 
 # NOTE: You can optionally create case sensitive filesystems on Macos and Windows now.
-if (LINUX)
+if (LINUX OR ANDROID)
     target_compile_definitions(common PRIVATE AGS_CASE_SENSITIVE_FILESYSTEM)
 endif()
 

diff --git a/Common/util/android_file.cpp b/Common/util/android_file.cpp
@@ -107,7 +107,8 @@ AndroidADir::AndroidADir(const String &dirname)
 {
     AAssetManager* mgr = GetAAssetManager();
     if(mgr == nullptr) {_dir = nullptr; return; }
-    _dir = AAssetManager_openDir(mgr, dirname.GetCStr());
+    String assetDirName = Path::GetPathInForeignAsset(dirname);
+    _dir = AAssetManager_openDir(mgr, assetDirName.GetCStr());
 }
 
 AndroidADir::~AndroidADir()