diff options
| author | Alex Mineer <amineer@chromium.org> | 2016-01-19 08:15:36 -0800 |
|---|---|---|
| committer | Alex Mineer <amineer@chromium.org> | 2016-01-19 16:17:35 +0000 |
| commit | eb26d4fdf0636a37d60d0d0e3ee93a907a0060b6 (patch) | |
| tree | bdfb5683792ede1e04ba9d4dff3cc8a9b48460d4 | |
| parent | 92eee5fadce818fd2ffec2821b0a1f09d6c25a55 (diff) | |
| download | chromium_src-eb26d4fdf0636a37d60d0d0e3ee93a907a0060b6.zip chromium_src-eb26d4fdf0636a37d60d0d0e3ee93a907a0060b6.tar.gz chromium_src-eb26d4fdf0636a37d60d0d0e3ee93a907a0060b6.tar.bz2 | |
GN(android) Fix oscilloscope crash in webaudio on arm64
TBR=dpranke
BUG=578209
Review URL: https://codereview.chromium.org/1595813002
(cherry picked from commit c6458dafbea2ec536e8f9a9793f9af47600ef743)
Cr-Original-Commit-Position: refs/heads/master@{#369941}
Cr-Commit-Position: refs/branch-heads/2623@{#10}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | third_party/WebKit/Source/config.gni | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/third_party/WebKit/Source/config.gni b/third_party/WebKit/Source/config.gni index 6d584ff..9f21023 100644 --- a/third_party/WebKit/Source/config.gni +++ b/third_party/WebKit/Source/config.gni @@ -25,15 +25,13 @@ declare_args() { blink_asserts_off_in_release = false } -# Whether Android ARM or x86 build uses OpenMAX DL FFT. Currently only -# supported on Android ARMv7+, ia32 or x64 without webview. When enabled, this -# will also enable WebAudio support on Android ARM, ia32 and x64. Default is -# enabled. Whether WebAudio is actually available depends on runtime settings -# and flags. +# Whether Android build uses OpenMAX DL FFT. Currently supported only on +# ARMv7+, ARM64, x86 or x64 without webview. Also enables WebAudio support. +# Whether WebAudio is actually available depends on runtime settings and flags. use_openmax_dl_fft = - is_android && - (current_cpu == "x86" || current_cpu == "x64" || - (current_cpu == "arm" && arm_version >= 7) || current_cpu == "mipsel") + is_android && (current_cpu == "x86" || current_cpu == "x64" || + (current_cpu == "arm" && arm_version >= 7) || + current_cpu == "arm64" || current_cpu == "mipsel") use_webaudio_ffmpeg = !is_mac && !is_android |