AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not try to compile x86 and x86_64 .asm files on Android

Browse Source 
This is currently only works on Linux hosts because we have checked
in a binary and does not work on Mac hosts.  We are disabling until
we find a suitable solution.

BUG=skia:4028

Review URL: https://codereview.chromium.org/1228823006
This commit is contained in:
msarett 2015-07-09 07:55:01 -07:00 committed by Commit bot
parent 2cdec31c29
commit 72394ef87c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gyp/libjpeg-turbo.gyp
View File

@ -113,10 +113,17 @@
# from asm files. This flag disables UseLibraryDependencyInputs to
# avoid this problem.
'msvs_2010_disable_uldi_when_referenced': 1,
# Add target-specific source files.
'conditions': [
[ 'skia_arch_type == "x86"', {
# FIXME (msarett): Reenable yasm on Android for x86 and x86_64
# https://code.google.com/p/skia/issues/detail?id=4028
[ 'skia_os == "android" and "x86" in skia_arch_type', {
'sources': [
'../third_party/externals/libjpeg-turbo/jsimd_none.c',
],
}],
[ 'skia_arch_type == "x86" and skia_os != "android"', {
'sources': [
'../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
'../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
@ -154,7 +161,7 @@
'../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
],
}],
[ 'skia_arch_type == "x86_64"', {
[ 'skia_arch_type == "x86_64" and skia_os != "android"', {
'sources': [
'../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
'../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',