diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-08 16:38:51 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-12-08 16:38:51 +0000 |
| commit | 48e941c487e51d0e2710952046ed44b1e4460516 (patch) | |
| tree | f1f672fa023785031f050dec1de83ede6c7d2cb7 /modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | |
| parent | 3216ca840696de7c7d69b7e10ca6f2bdb592ff47 (diff) | |
| parent | a42684bc490b5b0547a194e90254ac31f187d4b2 (diff) | |
| download | webrtc-48e941c487e51d0e2710952046ed44b1e4460516.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.95android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
This commit was generated by merge_to_master.py.
Change-Id: Ie8322cf9b80cce0537ab2f0dda42eb304fe28f87
Diffstat (limited to 'modules/audio_coding/codecs/isac/fix/source/isacfix.gypi')
| -rw-r--r-- | modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi index 7bef170d..54ff9df1 100644 --- a/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi +++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi @@ -87,7 +87,7 @@ 'pitch_filter_c.c', ], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'sources': [ 'entropy_coding_mips.c', 'filters_mips.c', |