diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-08 16:19:21 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-12-08 16:19:21 +0000 |
| commit | d0e274e9d63a0220093446ece6a8f633c0961a57 (patch) | |
| tree | d27078bff507b6f987bb6f729527d9c48d3dea4d | |
| parent | 63ea54f0e08983c20b01e79d2e58827747360dc3 (diff) | |
| parent | 33e74211aee74a1cde7968e646c59ba98337ea2a (diff) | |
| download | webrtc-d0e274e9d63a0220093446ece6a8f633c0961a57.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/a/external/webrtc/stable/webrtc.git at 33e74211aee74a1cde7968e646c59ba98337ea2a
This commit was generated by merge_from_chromium.py.
Change-Id: Ifdef209484f2547f7534ed54c2f52d7719c5a091
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | common_audio/common_audio.gyp | 2 | ||||
| -rw-r--r-- | modules/audio_coding/codecs/isac/fix/source/isacfix.gypi | 2 | ||||
| -rw-r--r-- | modules/audio_processing/audio_processing.gypi | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index fdf1abe1..1536b667 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -108,7 +108,6 @@ # Define MIPS architecture variant, MIPS DSP variant and MIPS FPU # This may be subject to change in accordance to Chromium's MIPS flags - 'mips_arch_variant%': 'mips32r1', 'mips_dsp_rev%': 0, 'mips_fpu%' : 1, 'enable_android_opensl%': 1, @@ -252,7 +251,7 @@ }], ], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'defines': [ 'MIPS32_LE', ], @@ -269,7 +268,7 @@ '-msoft-float', ], }], - ['mips_arch_variant=="mips32r2"', { + ['mips_arch_variant=="r2"', { 'defines': [ 'MIPS32_R2_LE', ], diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index e9abf822..aaf06dcb 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -122,7 +122,7 @@ }], ], # conditions }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'sources': [ 'signal_processing/include/spl_inl_mips.h', 'signal_processing/complex_bit_reverse_mips.c', 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', diff --git a/modules/audio_processing/audio_processing.gypi b/modules/audio_processing/audio_processing.gypi index ce65f643..e6fbafcb 100644 --- a/modules/audio_processing/audio_processing.gypi +++ b/modules/audio_processing/audio_processing.gypi @@ -112,7 +112,7 @@ 'ns/nsx_defines.h', ], 'conditions': [ - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'sources': [ 'ns/nsx_core_mips.c', ], @@ -139,7 +139,7 @@ ['(target_arch=="arm" and arm_version==7) or target_arch=="armv7"', { 'dependencies': ['audio_processing_neon',], }], - ['target_arch=="mipsel"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'sources': [ 'aecm/aecm_core_mips.c', ], |