diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-16 11:52:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 11:52:09 +0200 |
| commit | 89132224a651c0e0d4121270f63decb9a678ff88 (patch) | |
| tree | 224a008705391b6e5b560d2c0426380651756383 /platform/android | |
| parent | eb8d19ba740c11acf0f26080405fc5cd827a2d41 (diff) | |
| parent | e57042e8a93e4f3d65cc91633f5af0daedf69a2a (diff) | |
Merge pull request #6830 from akien-mga/thirdparty
Move most "drivers" as toggleable "modules" and split their thirdparty libraries in an own tree
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/detect.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 8e9a58da19..8d56dbcdaa 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -34,7 +34,6 @@ def get_flags(): return [ ('tools', 'no'), - ('builtin_zlib', 'no'), ('openssl', 'builtin'), #use builtin openssl ] @@ -203,7 +202,8 @@ def configure(env): env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT']) # env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT']) - if(env["opus"]=="yes"): + # TODO: Move that to opus module's config + if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"): if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"): env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) env.opus_fixed_point="yes" |