more APK archive fixes

devshgraphicsprogramming · devshgraphicsprogramming · commit c13abd661bbb · 2022-03-09T12:59:59.000+01:00
diff --git a/src/nbl/system/CAPKResourcesArchive.cpp b/src/nbl/system/CAPKResourcesArchive.cpp
@@ -5,6 +5,7 @@ using namespace nbl::system;
 
 #ifdef _NBL_PLATFORM_ANDROID_
 #include <jni.h>
+#include <android/native_activity.h>
 #include <android/asset_manager.h>
 
 CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* act, JNIEnv* jni)
@@ -56,7 +57,7 @@ core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const
 CFileArchive::file_buffer_t CAPKResourcesArchive::getFileBuffer(const IFileArchive::SListEntry* item)
 {
 	AAsset* asset = AAssetManager_open(m_mgr,item->pathRelativeToArchive.string().c_str(),AASSET_MODE_BUFFER);
-	return {AAsset_getBuffer(asset),AAsset_getLength(asset),asset};
+	return {const_cast<void*>(AAsset_getBuffer(asset)),AAsset_getLength(asset),asset};
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ using namespace nbl::system;`
`5`	`5`
`6`	`6`	`#ifdef _NBL_PLATFORM_ANDROID_`
`7`	`7`	`#include <jni.h>`
	`8`	`+#include <android/native_activity.h>`
`8`	`9`	`#include <android/asset_manager.h>`
`9`	`10`
`10`	`11`	`CAPKResourcesArchive::CAPKResourcesArchive(const path& _path, system::logger_opt_smart_ptr&& logger, ANativeActivity* act, JNIEnv* jni)`
`@@ -56,7 +57,7 @@ core::vector<IFileArchive::SListEntry> CAPKResourcesArchive::computeItems(const`
`56`	`57`	`CFileArchive::file_buffer_t CAPKResourcesArchive::getFileBuffer(const IFileArchive::SListEntry* item)`
`57`	`58`	`{`
`58`	`59`	`AAsset* asset = AAssetManager_open(m_mgr,item->pathRelativeToArchive.string().c_str(),AASSET_MODE_BUFFER);`
`59`		`- return {AAsset_getBuffer(asset),AAsset_getLength(asset),asset};`
	`60`	`+ return {const_cast<void*>(AAsset_getBuffer(asset)),AAsset_getLength(asset),asset};`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`#endif`