summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Lourenço <madequa@users.noreply.github.com>2020-01-09 20:46:06 +0000
committerBruno Lourenço <madequa@users.noreply.github.com>2020-01-09 20:46:06 +0000
commit90b49e8888101a4c85292a5dd1b9a6275d4e4d8e (patch)
treea24c7918ea7fad1fddab195ffa4c3ece9db1306b
parent76678b2609921f27f52c1a2e2bd62b8d2a27bb4b (diff)
Fix Android exporter manifest creation.
-rw-r--r--platform/android/export/export.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index d7a72779e6..b4b38ac450 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -883,10 +883,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
ns_android_string = string_table.size() - 1;
}
- int32_t attr_uses_permission_string = string_table.find("uses-feature");
- if (attr_uses_permission_string == -1) {
+ int32_t attr_uses_feature_string = string_table.find("uses-feature");
+ if (attr_uses_feature_string == -1) {
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");
@@ -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);
// start tag
@@ -938,7 +938,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
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 + 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 + 26]); // attr_size
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(-1, &p_manifest.write[ofs + 12]); // comment
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;
}