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

Tweak Android-related error messages in the Export dialog

Browse source 
OpenJDK 8 has been working well for exporting to Android
for a while now, so it can be recommended instead of OpenJDK 6.
This commit is contained in:
Hugo Locurcio 2018-09-08 13:51:00 +02:00
parent df39a034dc
commit 8c8164129c
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1337,7 +1337,7 @@ public:
if (!FileAccess::exists(adb)) { if (!FileAccess::exists(adb)) {
valid = false; valid = false;
err += "ADB executable not configured in editor settings.\n"; err += "ADB executable not configured in the Editor Settings.\n";
} }
String js = EditorSettings::get_singleton()->get("export/android/jarsigner"); String js = EditorSettings::get_singleton()->get("export/android/jarsigner");
@ -1345,7 +1345,7 @@ public:
if (!FileAccess::exists(js)) { if (!FileAccess::exists(js)) {
valid = false; valid = false;
err += "OpenJDK 6 jarsigner not configured in editor settings.\n"; err += "OpenJDK 8 jarsigner not configured in the Editor Settings.\n";
} }
String dk = EditorSettings::get_singleton()->get("export/android/debug_keystore"); String dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
@ -1353,7 +1353,7 @@ public:
if (!FileAccess::exists(dk)) { if (!FileAccess::exists(dk)) {
valid = false; valid = false;
err += "Debug Keystore not configured in editor settings.\n"; err += "Debug keystore not configured in the Editor Settings.\n";
} }
bool apk_expansion = p_preset->get("apk_expansion/enable"); bool apk_expansion = p_preset->get("apk_expansion/enable");
@ -1372,7 +1372,7 @@ public:
if (apk_expansion_pkey == "") { if (apk_expansion_pkey == "") {
valid = false; valid = false;
err += "Invalid public key for apk expansion.\n"; err += "Invalid public key for APK expansion.\n";
} }
} }
@ -1680,7 +1680,7 @@ public:
String jarsigner = EditorSettings::get_singleton()->get("export/android/jarsigner"); String jarsigner = EditorSettings::get_singleton()->get("export/android/jarsigner");
if (!FileAccess::exists(jarsigner)) { if (!FileAccess::exists(jarsigner)) {
EditorNode::add_io_error("'jarsigner' could not be found.\nPlease supply a path in the editor settings.\nResulting apk is unsigned."); EditorNode::add_io_error("'jarsigner' could not be found.\nPlease supply a path in the Editor Settings.\nThe resulting APK is unsigned.");
return OK; return OK;
} }
@ -1692,14 +1692,14 @@ public:
password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass"); password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass");
user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user"); user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user");
ep.step("Signing Debug APK...", 103); ep.step("Signing debug APK...", 103);
} else { } else {
keystore = release_keystore; keystore = release_keystore;
password = release_password; password = release_password;
user = release_username; user = release_username;
ep.step("Signing Release APK...", 103); ep.step("Signing release APK...", 103);
} }
if (!FileAccess::exists(keystore)) { if (!FileAccess::exists(keystore)) {
@ -1742,7 +1742,7 @@ public:
OS::get_singleton()->execute(jarsigner, args, true, NULL, NULL, &retval); OS::get_singleton()->execute(jarsigner, args, true, NULL, NULL, &retval);
if (retval) { if (retval) {
EditorNode::add_io_error("'jarsigner' verification of APK failed. Make sure to use jarsigner from Java 6."); EditorNode::add_io_error("'jarsigner' verification of APK failed. Make sure to use a jarsigner from OpenJDK 8.");
return ERR_CANT_CREATE; return ERR_CANT_CREATE;
} }
} }