From 47b742ed45aea8a9d042e96df4ef08c038e0f441 Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Mon, 19 Oct 2020 03:03:33 -0400
Subject: [PATCH] Use GPAs on Android and just don't compress them.

---
 AerofoilAndroid/app/build.gradle              |  4 ++
 .../app/jni/main/GpFileSystem_Android.cpp     |  4 +-
 AerofoilAndroid/copy_packaged_resources.bat   | 44 ++-----------------
 3 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/AerofoilAndroid/app/build.gradle b/AerofoilAndroid/app/build.gradle
index 9377ee8..8623af3 100644
--- a/AerofoilAndroid/app/build.gradle
+++ b/AerofoilAndroid/app/build.gradle
@@ -64,6 +64,10 @@ android {
             }
         }
     }
+
+	aaptOptions {
+		noCompress 'gpa'
+	}
 }
 
 dependencies {
diff --git a/AerofoilAndroid/app/jni/main/GpFileSystem_Android.cpp b/AerofoilAndroid/app/jni/main/GpFileSystem_Android.cpp
index 68a8928..6de3321 100644
--- a/AerofoilAndroid/app/jni/main/GpFileSystem_Android.cpp
+++ b/AerofoilAndroid/app/jni/main/GpFileSystem_Android.cpp
@@ -507,7 +507,7 @@ bool GpFileSystem_Android::DeleteFile(PortabilityLayer::VirtualDirectory_t virtu
 
 PortabilityLayer::HostDirectoryCursor *GpFileSystem_Android::ScanDirectoryNested(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *const *paths, size_t numPaths)
 {
-	if (IsVirtualDirectoryLooseResources(virtualDirectory))
+	if (virtualDirectory == PortabilityLayer::VirtualDirectories::kGameData || virtualDirectory == PortabilityLayer::VirtualDirectories::kApplicationData)
 		return ScanAssetDirectory(virtualDirectory, paths, numPaths);
 
 	return ScanStorageDirectory(virtualDirectory, paths, numPaths);
@@ -561,7 +561,7 @@ bool GpFileSystem_Android::ValidateFilePathUnicodeChar(uint32_t c) const
 
 bool GpFileSystem_Android::IsVirtualDirectoryLooseResources(PortabilityLayer::VirtualDirectory_t virtualDir) const
 {
-	return virtualDir == PortabilityLayer::VirtualDirectories::kApplicationData || virtualDir == PortabilityLayer::VirtualDirectories::kGameData;
+	return false;
 }
 
 GpFileSystem_Android *GpFileSystem_Android::GetInstance()
diff --git a/AerofoilAndroid/copy_packaged_resources.bat b/AerofoilAndroid/copy_packaged_resources.bat
index 8acae5b..e9e69fb 100644
--- a/AerofoilAndroid/copy_packaged_resources.bat
+++ b/AerofoilAndroid/copy_packaged_resources.bat
@@ -1,50 +1,12 @@
-rmdir /S /Q app\src\main\assets\Packaged\ApplicationResources
-..\Tools\7z.exe x -oapp\src\main\assets\Packaged\ApplicationResources ..\Packaged\ApplicationResources.gpa
 cd app
 cd src
 cd main
 cd assets
+rmdir /S /Q Packaged
+mkdir Packaged
 cd Packaged
 rmdir /S /Q Houses
 mkdir Houses
+copy ..\..\..\..\..\..\Packaged\*.gpa .\
 copy ..\..\..\..\..\..\Packaged\Houses\* Houses\
-cd Houses
-..\..\..\..\..\..\..\Tools\7z.exe x "-oArt Museum" "Art Museum.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oArt Museum.mov" "Art Museum.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oCalifornia or Bust!" "California or Bust!.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oCastle o' the Air" "Castle o' the Air.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oCastle o' the Air.mov" "Castle o' the Air.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oCD Demo House" "CD Demo House.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oCD Demo House.mov" "CD Demo House.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oDavis Station" "Davis Station.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oDavis Station.mov" "Davis Station.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oDemo House" "Demo House.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oDemo House.mov" "Demo House.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oEmpty House" "Empty House.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oFun House" "Fun House.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oGrand Prix" "Grand Prix.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oGrand Prix.mov" "Grand Prix.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oImagineHouse PRO II" "ImagineHouse PRO II.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oImagineHouse PRO II.mov" "ImagineHouse PRO II.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oIn The Mirror" "In The Mirror.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oLand of Illusion" "Land of Illusion.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oLand of Illusion.mov" "Land of Illusion.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oLeviathan" "Leviathan.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oLeviathan.mov" "Leviathan.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oMetropolis" "Metropolis.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oNemo's Market" "Nemo's Market.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oNemo's Market.mov" "Nemo's Market.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oRainbow's End" "Rainbow's End.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oRainbow's End.mov" "Rainbow's End.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oSampler" "Sampler.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oSlumberland" "Slumberland.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oSlumberland.mov" "Slumberland.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oSpacePods" "SpacePods.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oSpacePods.mov" "SpacePods.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oTeddy World" "Teddy World.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oTeddy World.mov" "Teddy World.mov.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oThe Asylum Pro" "The Asylum Pro.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oTitanic" "Titanic.gpa"
-..\..\..\..\..\..\..\Tools\7z.exe x "-oTitanic.mov" "Titanic.mov.gpa"
-del /Q *.gpa
 cd ..