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

Unified Diff: gyp/libjpeg-turbo.gyp

Issue 1228553010: Remove skia_arch_width, fold into skia_arch_type. (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
« gyp/everything.gyp ('K') | « gyp/everything.gyp ('k') | gyp/tools.gyp » ('j') | 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..95bac9e94d10c7bba393caad72f13ef4f7251546 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -194,19 +194,16 @@
}],
],
}],
- [ 'skia_arch_type == "mips"', {
- 'conditions': [
- [ 'skia_arch_width == 64', {
- 'sources': [
- '../third_party/externals/libjpeg-turbo/simd/jsimd_mips.c',
- '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h',
- '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2.S',
- ],
- }, {
- 'sources': [
- '../third_party/externals/libjpeg-turbo/jsimd_none.c',
- ],
- }],
+ [ 'skia_arch_type == "mips64"', {
mtklein 2015/07/09 16:29:57 This is a lot nicer.
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/simd/jsimd_mips.c',
+ '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2_asm.h',
+ '../third_party/externals/libjpeg-turbo/simd/jsimd_mips_dspr2.S',
+ ],
+ }],
+ [ 'skia_arch_type == "mips32"', {
+ 'sources': [
+ '../third_party/externals/libjpeg-turbo/jsimd_none.c',
],
}],
« gyp/everything.gyp ('K') | « gyp/everything.gyp ('k') | gyp/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698