diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:11:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-02 10:11:35 -0300 |
| commit | d65f7754735eed5eb42060a8428f873cf8bb33b4 (patch) | |
| tree | 46eda7928eff21799acd331cfb151f04bec2c353 /platform/android/export/export.cpp | |
| parent | e82dc402052a47b44bb3bcf50ee4801257f92778 (diff) | |
| parent | 49edff9536fbf5d673f79b0cef09fea03d93f770 (diff) | |
Merge pull request #855 from adolson/android-release-keystore-fix
fixes for release apk export
Diffstat (limited to 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 6bf94b8289..2b4a2baf24 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -398,8 +398,9 @@ void EditorExportPlatformAndroid::_get_property_list( List<PropertyInfo> *p_list p_list->push_back( PropertyInfo( Variant::BOOL, "screen/support_normal") ); p_list->push_back( PropertyInfo( Variant::BOOL, "screen/support_large") ); p_list->push_back( PropertyInfo( Variant::BOOL, "screen/support_xlarge") ); - p_list->push_back( PropertyInfo( Variant::STRING, "keystore/release",PROPERTY_HINT_FILE,"keystore") ); + p_list->push_back( PropertyInfo( Variant::STRING, "keystore/release",PROPERTY_HINT_GLOBAL_FILE,"keystore") ); p_list->push_back( PropertyInfo( Variant::STRING, "keystore/release_user" ) ); + p_list->push_back( PropertyInfo( Variant::STRING, "keystore/release_password" ) ); p_list->push_back( PropertyInfo( Variant::BOOL, "apk_expansion/enable" ) ); p_list->push_back( PropertyInfo( Variant::STRING, "apk_expansion/SALT" ) ); p_list->push_back( PropertyInfo( Variant::STRING, "apk_expansion/public_key",PROPERTY_HINT_MULTILINE_TEXT ) ); |