summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-09-23 07:28:04 +0200
committerGitHub <noreply@github.com>2016-09-23 07:28:04 +0200
commit2af6b3dd1b564c5a58fbb16b3c04c791d73e8b26 (patch)
tree902d21124817b7da2bed768293708d45c3172006 /platform
parent53c1c7ff8f062529bcdceabd62416c6f483ca523 (diff)
parent2c9d98bb4869ad8a8ec7af9ba0c8dd7d7c243fb5 (diff)
Merge pull request #6574 from RandomShaper/fix-android-export
Fix manifest generation bug in Android export
Diffstat (limited to 'platform')
-rw-r--r--platform/android/export/export.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 8f3edfcaa7..4735a91f43 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -913,15 +913,13 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
}
- ret.resize(ret.size()+stable_extra.size());
- while(ret.size()%4)
- ret.push_back(0);
-
for(int i=0;i<stable_extra.size();i++) {
-
- chars[i]=stable_extra[i];
+ ret.push_back(stable_extra[i]);
}
+ while(ret.size()%4)
+ ret.push_back(0);
+
uint32_t new_stable_end=ret.size();