diff options
| author | jonyrock | 2014-05-01 20:15:28 +0400 |
|---|---|---|
| committer | jonyrock | 2014-05-01 20:15:28 +0400 |
| commit | 209eaf6fa06eba8a05e5222bdab418cd0f20c91c (patch) | |
| tree | 94eac56be6ad254a7c09e13d5e14bd843626232c /platform/android/detect.py | |
| parent | 34aea718b11e105d30c938ad34e474b1bd8b5d63 (diff) | |
| parent | 6572d5128856b2ec55a2c417c92e584899f4906f (diff) | |
| download | godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.gz godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.zst godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.zip | |
Merge remote-tracking branch 'upstream/master' into pair_symbols_tool
Diffstat (limited to 'platform/android/detect.py')
| -rw-r--r-- | platform/android/detect.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 72a16ab59..cd7f0d8de 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -37,7 +37,8 @@ def get_flags(): ('tools', 'no'), ('nedmalloc', 'no'), ('builtin_zlib', 'no'), - ] + ('openssl','builtin'), #use builtin openssl + ] def create(env): |