diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-04 17:01:01 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-12-04 17:01:01 +0000 |
| commit | 0fbb12c389068783ecb17422e91d3bc7b675aecf (patch) | |
| tree | 803037453a0c75fe41d015357de292eae33f4378 | |
| parent | 361320edab39c39820a61c753b14555c603423a7 (diff) | |
| parent | 71616dbb8cdd3ea13e0a964d18456ca3fe002dab (diff) | |
| download | webrtc-0fbb12c389068783ecb17422e91d3bc7b675aecf.tar.gz | |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 71616dbb8cdd3ea13e0a964d18456ca3fe002dab
This commit was generated by merge_from_chromium.py.
Change-Id: I40a02c5091b60b596c558bfc0f03c06c63d7fb7a
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -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, 5 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 366e7e9f..6c3cc7b1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -110,7 +110,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%': 'r1', 'mips_dsp_rev%': 0, 'mips_fpu%' : 1, 'enable_android_opensl%': 1, @@ -274,7 +273,7 @@ }], ], }], - ['target_arch=="mipsel" and mips_arch_variant!="r6"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'defines': [ 'MIPS32_LE', ], diff --git a/common_audio/common_audio.gyp b/common_audio/common_audio.gyp index 8f96674f..baa0d616 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -140,7 +140,7 @@ }], ], # conditions }], - ['target_arch=="mipsel" and mips_arch_variant!="r6"', { + ['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 2a36309f..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" and mips_arch_variant!="r6"', { + ['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 2ddcffc9..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" and mips_arch_variant!="r6"', { + ['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" and mips_arch_variant!="r6"', { + ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', { 'sources': [ 'aecm/aecm_core_mips.c', ], |