diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 19:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 19:12:58 +0100 |
| commit | 2709113c83465f8e0e6d6e63db6032106523a9f1 (patch) | |
| tree | 760eb6f99176aebf35403a9b4a20ec54977567df /modules | |
| parent | 3bdd1ff3875450d90f7a695aa5d527a47558d80c (diff) | |
| parent | 6770357e47b5fcc1d829e0890a3140c91be16872 (diff) | |
Merge pull request #24499 from akien-mga/android-thirdparty
Android: Better identify thirdparty C/C++ code
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/webm/libvpx/SCsub | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 98e38b9027..348de485be 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -379,6 +379,9 @@ if webm_cpu_x86: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_x86_64asm) elif webm_cpu_arm: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm) + if env["platform"] == 'android': + env_libvpx.Append(CPPPATH=[libvpx_dir + "third_party/android"]) + env_libvpx.add_source_files(env.modules_sources, [libvpx_dir + "third_party/android/cpu-features.c"]) env_libvpx_neon = env_libvpx.Clone() if env["platform"] == 'android' and env["android_arch"] == 'armv6': |