diff options
| author | fhuya <fhuyakou@gmail.com> | 2019-06-19 12:05:58 -0700 |
|---|---|---|
| committer | fhuya <fhuyakou@gmail.com> | 2019-06-19 12:05:58 -0700 |
| commit | f7200d696005c65098ccf56f648a9c1a092aa905 (patch) | |
| tree | 551f6ec34f96f63f53ec55e12c737077d8594c24 /modules | |
| parent | 02ed4b392cc6655bfd9958c0c0fececffd8e5836 (diff) | |
Deprecate armv6 support for Android
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/opus/SCsub | 2 | ||||
| -rw-r--r-- | modules/webm/libvpx/SCsub | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/opus/SCsub b/modules/opus/SCsub index f3c981dd45..a4a431bab7 100644 --- a/modules/opus/SCsub +++ b/modules/opus/SCsub @@ -221,7 +221,7 @@ if env['builtin_opus']: env_opus.Prepend(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) if env["platform"] == "android": - if ("android_arch" in env and env["android_arch"] in ["armv6", "armv7"]): + if ("android_arch" in env and env["android_arch"] == "armv7"): env_opus.Append(CPPFLAGS=["-DOPUS_ARM_OPT"]) elif ("android_arch" in env and env["android_arch"] == "arm64v8"): env_opus.Append(CPPFLAGS=["-DOPUS_ARM64_OPT"]) diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index a6be1380a6..c76585013c 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -384,8 +384,6 @@ elif webm_cpu_arm: 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': - env_libvpx_neon.Append(CCFLAGS=['-mfpu=neon']) env_libvpx_neon.add_source_files(env.modules_sources, libvpx_sources_arm_neon) if env["platform"] == 'uwp': |