diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:13:30 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:13:30 -0300 |
| commit | 4e25f3e4b706f036fd2c4a97e4b73d1c9149f697 (patch) | |
| tree | d1347beaae5c0e48d7b2d52541180dd75103c8c1 /platform | |
| parent | d65f7754735eed5eb42060a8428f873cf8bb33b4 (diff) | |
| parent | 46a922d3ab6be0707754c44f35ae5733dcca6b40 (diff) | |
Merge pull request #853 from adolson/tsa-option-for-android
add timestamping authority server option for Android
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/export/export.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 2b4a2baf24..bcc818dac8 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1238,6 +1238,11 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d args.push_back("SHA1"); args.push_back("-sigalg"); 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("-keystore"); args.push_back(keystore); @@ -1627,6 +1632,7 @@ void register_android_exporter() { //EDITOR_DEF("android/release_keystore",""); //EDITOR_DEF("android/release_username",""); //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) ); EditorImportExport::get_singleton()->add_export_platform(exporter); |