maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5223 from RandomShaper/fix-android-export

Browse source 
Fix Android export
This commit is contained in:
Rémi Verschelde 2016-06-15 15:44:35 +02:00 committed by GitHub
parent 5c135bc0b3 1fcb2a1a00
commit 1899f7f28d
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
platform/android/export/export.cpp
View file

@ -232,7 +232,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
void _fix_manifest(Vector<uint8_t>& p_manifest, bool p_give_internet); void _fix_manifest(Vector<uint8_t>& p_manifest, bool p_give_internet);
void _fix_resources(Vector<uint8_t>& p_manifest); void _fix_resources(Vector<uint8_t>& p_manifest);
static Error save_apk_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total); static Error save_apk_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
static bool _should_compress_asset(const String& p_path); static bool _should_compress_asset(const String& p_path, const Vector<uint8_t>& p_data);
protected: protected:
@ -1003,7 +1003,7 @@ Error EditorExportPlatformAndroid::save_apk_file(void *p_userdata,const String&
NULL, NULL,
0, 0,
NULL, NULL,
_should_compress_asset(p_path) ? Z_DEFLATED : 0, _should_compress_asset(p_path,p_data) ? Z_DEFLATED : 0,
Z_DEFAULT_COMPRESSION); Z_DEFAULT_COMPRESSION);
@ -1014,7 +1014,7 @@ Error EditorExportPlatformAndroid::save_apk_file(void *p_userdata,const String&
} }
bool EditorExportPlatformAndroid::_should_compress_asset(const String& p_path) { bool EditorExportPlatformAndroid::_should_compress_asset(const String& p_path, const Vector<uint8_t>& p_data) {
/* /*
* By not compressing files with little or not benefit in doing so, * By not compressing files with little or not benefit in doing so,
@ -1049,12 +1049,7 @@ bool EditorExportPlatformAndroid::_should_compress_asset(const String& p_path) {
// -- Compressed resource? // -- Compressed resource?
FileAccess *f=FileAccess::open(p_path,FileAccess::READ); if (p_data.size() >= 4 && p_data[0]=='R' && p_data[1]=='S' && p_data[2]=='C' && p_data[3]=='C') {
ERR_FAIL_COND_V(!f,true);
uint8_t header[4];
f->get_buffer(header,4);
if (header[0]=='R' && header[1]=='S' && header[2]=='C' && header[3]=='C') {
// Already compressed // Already compressed
return false; return false;
} }