diff options
author | andrew@webrtc.org <andrew@webrtc.org> | 2014-12-02 23:35:57 +0000 |
---|---|---|
committer | andrew@webrtc.org <andrew@webrtc.org> | 2014-12-02 23:35:57 +0000 |
commit | 33e74211aee74a1cde7968e646c59ba98337ea2a (patch) | |
tree | 6b6d18947fe11e90b4e2b851e375bbc726b54f8d | |
parent | 91c8c2ef0cb754bbda9e5cbb96d78a3da77c929b (diff) | |
download | webrtc-33e74211aee74a1cde7968e646c59ba98337ea2a.tar.gz |
Merge 7729 "Build fix for MIPS Android Webview build."
> Build fix for MIPS Android Webview build.
>
> Excluding optimizations to support MIPS32R6 platform for Android Webview build (see also https://code.google.com/p/webrtc/source/detail?r=7580).
>
> R=andrew@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/32459004
TBR=ljubomir.papuga@gmail.com
BUG=chromium:438351
Review URL: https://webrtc-codereview.appspot.com/27329004
git-svn-id: http://webrtc.googlecode.com/svn/branches/39/webrtc@7786 4adac7df-926f-26a2-2b94-8c16560cd09d
-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 b63d2566..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%': 'r1', 'mips_dsp_rev%': 0, 'mips_fpu%' : 1, 'enable_android_opensl%': 1, @@ -252,7 +251,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 5506b3aa..aaf06dcb 100644 --- a/common_audio/common_audio.gyp +++ b/common_audio/common_audio.gyp @@ -122,7 +122,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', ], |