diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 21:04:24 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-16 21:04:24 +0000 |
| commit | 82e9b00173728dec5101128b3f1e9098ddfaef6f (patch) | |
| tree | e34604551a09434bbad27a5225376e85cb9647c7 /build/common.gypi | |
| parent | 1ac2ff16fcc54685649c471a5efcdeb1e8bf3f2f (diff) | |
| download | chromium_src-82e9b00173728dec5101128b3f1e9098ddfaef6f.zip chromium_src-82e9b00173728dec5101128b3f1e9098ddfaef6f.tar.gz chromium_src-82e9b00173728dec5101128b3f1e9098ddfaef6f.tar.bz2 | |
[Android] Fix compilation with order_profiling=1
I'm guesing we haven't built this since rolling the NDK. I see errors of
the form:
In file included from ../../third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding_neon.c:19:0:
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h: In function 'vshr_n_s32':
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h: In function 'vshl_n_s32':
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3798:3: error: argument must be a constant
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h: In function 'vshll_n_s16':
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:4032:3: error: argument must be a constant
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h: In function 'vset_lane_s32':
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:5082:3: error: argument must be a constant
third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:5082: confused by earlier errors, bailing out
One additional fix to md5sum is included.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/18034029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 683fa81..c0e6158 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3334,10 +3334,17 @@ 'cflags': [ '-finstrument-functions', # Allow mmx intrinsics to inline, so that the - # compiler can expand the intrinsics. + #0 compiler can expand the intrinsics. '-finstrument-functions-exclude-file-list=mmintrin.h', ], }], + ['_toolset=="target" and OS=="android"', { + 'cflags': [ + # Avoids errors with current NDK: + # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant" + '-finstrument-functions-exclude-file-list=arm_neon.h', + ], + }], ], }], ['linux_dump_symbols==1', { |