godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make remote FS work with GDNative on Android

Browse Source 
.so files are added to the .apk when remote FS is used.
This commit is contained in:
Ruslan Mustakov 2018-01-16 12:36:18 +07:00
parent 7de3a11469
commit 99f93ea440
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/export/export.cpp
View File

@ -552,6 +552,10 @@ class EditorExportAndroid : public EditorExportPlatform {
return OK; return OK;
} }
static Error ignore_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total) {
return OK;
}
void _fix_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_manifest, bool p_give_internet) { void _fix_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &p_manifest, bool p_give_internet) {
// Leaving the unused types commented because looking these constants up // Leaving the unused types commented because looking these constants up
@ -1504,6 +1508,10 @@ public:
cl.push_back(passwd); cl.push_back(passwd);
}*/ }*/
APKExportData ed;
ed.ep = &ep;
ed.apk = unaligned_apk;
err = export_project_files(p_preset, ignore_apk_file, &ed, save_apk_so);
} else { } else {
//all files //all files
@ -1531,6 +1539,7 @@ public:
err = export_project_files(p_preset, save_apk_file, &ed, save_apk_so); err = export_project_files(p_preset, save_apk_file, &ed, save_apk_so);
} }
}
if (!err) { if (!err) {
APKExportData ed; APKExportData ed;
@ -1544,7 +1553,6 @@ public:
} }
} }
} }
}
if (use_32_fb) if (use_32_fb)
cl.push_back("--use_depth_32"); cl.push_back("--use_depth_32");