Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1331)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 1228823006: Do not try to compile x86 and x86_64 .asm files on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 25a919fb99ffad17dd51bc9f505f37cf6f61ab4e..aeb273f90dbd8c38c7f18b4eefbfb13138c7a545 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -117,61 +117,79 @@
# Add target-specific source files.
'conditions': [
djsollen 2015/07/09 14:09:18 skia_os = "android && (skia_arch_type == "x86" or
msarett 2015/07/09 14:18:17 Done.
[ 'skia_arch_type == "x86"', {
djsollen 2015/07/09 14:09:18 and skia_os != android
msarett 2015/07/09 14:18:17 Done.
- 'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
- '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
+ # FIXME (msarett): Reenable yasm on Android for x86 and x86_64
+ # https://code.google.com/p/skia/issues/detail?id=4028
+ 'conditions': [
+ [ 'skia_os == "android"', {
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+ ],
+ }, {
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
+ '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
+ ],
+ }],
],
}],
[ 'skia_arch_type == "x86_64"', {
- 'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
- '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm',
- '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm',
+ 'conditions': [
+ [ 'skia_os == "android"', {
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+ ],
+ }, {
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
+ '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm',
+ '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm',
+ ],
+ }],
],
}],
[ 'skia_arch_type == "arm64"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698