diff options
| author | Rémi Verschelde | 2016-10-14 22:17:03 +0200 |
|---|---|---|
| committer | GitHub | 2016-10-14 22:17:03 +0200 |
| commit | 17f06202b7d5e00b6bf250e03b0ca994ee5dd298 (patch) | |
| tree | d6a6897a07c762fb6263e77ab4ed14815f2aa244 /platform/android/detect.py | |
| parent | 6ca2128ff8439fa669995f54940389b8f5d9b854 (diff) | |
| parent | f63bf12193deaf9cae5b1d6c7289afc17a7de946 (diff) | |
| download | godot-17f06202b7d5e00b6bf250e03b0ca994ee5dd298.tar.gz godot-17f06202b7d5e00b6bf250e03b0ca994ee5dd298.tar.zst godot-17f06202b7d5e00b6bf250e03b0ca994ee5dd298.zip | |
Merge pull request #6827 from akien-mga/pr-bye-nedmalloc
Drop nedmalloc which is apparently not used anymore
Diffstat (limited to 'platform/android/detect.py')
| -rw-r--r-- | platform/android/detect.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 7e482047c..8e9a58da1 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,10 +34,9 @@ def get_flags(): return [ ('tools', 'no'), - ('nedmalloc', 'no'), ('builtin_zlib', 'no'), - ('openssl','builtin'), #use builtin openssl - ] + ('openssl', 'builtin'), #use builtin openssl + ] def create(env): |