Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-17 16:44:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #34965 from MadEqua/fix-android-exporter-manifest

Browse Source 
Fix Android exporter manifest creation.
This commit is contained in:
Rémi Verschelde 2020-01-10 07:35:53 +01:00 committed by GitHub
commit a126bda47b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,10 +883,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
ns_android_string = string_table.size() - 1; ns_android_string = string_table.size() - 1;
} }
int32_t attr_uses_permission_string = string_table.find("uses-feature"); int32_t attr_uses_feature_string = string_table.find("uses-feature");
if (attr_uses_permission_string == -1) { if (attr_uses_feature_string == -1) {
string_table.push_back("uses-feature"); string_table.push_back("uses-feature");
attr_uses_permission_string = string_table.size() - 1; attr_uses_feature_string = string_table.size() - 1;
} }
int32_t attr_required_string = string_table.find("required"); int32_t attr_required_string = string_table.find("required");
@ -928,7 +928,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
} }
{ {
manifest_cur_size += 96 + 20; // node and three attrs + end node manifest_cur_size += 96 + 24; // node and three attrs + end node
p_manifest.resize(manifest_cur_size); p_manifest.resize(manifest_cur_size);
// start tag // start tag
@ -938,7 +938,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
encode_uint16(3, &p_manifest.write[ofs + 28]); // num_attrs encode_uint16(3, &p_manifest.write[ofs + 28]); // num_attrs
@ -982,7 +982,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name encode_uint32(attr_uses_feature_string, &p_manifest.write[ofs + 20]); // name
ofs += 24; ofs += 24;
} }