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

Merge pull request #853 from adolson/tsa-option-for-android

Browse Source 
add timestamping authority server option for Android
This commit is contained in:
Juan Linietsky 2014-11-02 10:13:30 -03:00
commit 4e25f3e4b7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1238,6 +1238,11 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d
args.push_back("SHA1"); args.push_back("SHA1");
args.push_back("-sigalg"); args.push_back("-sigalg");
args.push_back("MD5withRSA"); args.push_back("MD5withRSA");
String tsa_url=EditorSettings::get_singleton()->get("android/timestamping_authority_url");
if (tsa_url != "") {
args.push_back("-tsa");
args.push_back(tsa_url);
}
args.push_back("-verbose"); args.push_back("-verbose");
args.push_back("-keystore"); args.push_back("-keystore");
args.push_back(keystore); args.push_back(keystore);
@ -1627,6 +1632,7 @@ void register_android_exporter() {
//EDITOR_DEF("android/release_keystore",""); //EDITOR_DEF("android/release_keystore","");
//EDITOR_DEF("android/release_username",""); //EDITOR_DEF("android/release_username","");
//EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore")); //EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"android/release_keystore",PROPERTY_HINT_GLOBAL_FILE,"*.keystore"));
EDITOR_DEF("android/timestamping_authority_url","");
Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) ); Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) );
EditorImportExport::get_singleton()->add_export_platform(exporter); EditorImportExport::get_singleton()->add_export_platform(exporter);