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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'xcode_settings': { 6 'xcode_settings': {
7 'SYMROOT': '<(DEPTH)/xcodebuild', 7 'SYMROOT': '<(DEPTH)/xcodebuild',
8 }, 8 },
9 'variables': { 9 'variables': {
10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo', 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/li bjpeg-turbo',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 'direct_dependent_settings': { 106 'direct_dependent_settings': {
107 'include_dirs': [ 107 'include_dirs': [
108 '../third_party/externals/libjpeg-turbo/', 108 '../third_party/externals/libjpeg-turbo/',
109 ], 109 ],
110 }, 110 },
111 'msvs_disabled_warnings': [4018, 4101], 111 'msvs_disabled_warnings': [4018, 4101],
112 # VS2010 does not correctly incrementally link obj files generated 112 # VS2010 does not correctly incrementally link obj files generated
113 # from asm files. This flag disables UseLibraryDependencyInputs to 113 # from asm files. This flag disables UseLibraryDependencyInputs to
114 # avoid this problem. 114 # avoid this problem.
115 'msvs_2010_disable_uldi_when_referenced': 1, 115 'msvs_2010_disable_uldi_when_referenced': 1,
116 116
117 # Add target-specific source files. 117 # Add target-specific source files.
118 'conditions': [ 118 'conditions': [
119 [ 'skia_arch_type == "x86"', { 119 # FIXME (msarett): Reenable yasm on Android for x86 and x86_64
120 # https://code.google.com/p/skia/issues/detail?id=4028
121 [ 'skia_os == "android" and "x86" in skia_arch_type', {
122 'sources': [
123 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
124 ],
125 }],
126 [ 'skia_arch_type == "x86" and skia_os != "android"', {
120 'sources': [ 127 'sources': [
121 '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c', 128 '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
122 '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm', 129 '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
123 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm', 130 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
124 '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm', 131 '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
125 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm', 132 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
126 '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm', 133 '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
127 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm', 134 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
128 '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm', 135 '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
129 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm', 136 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
(...skipping 17 matching lines...) Expand all
147 '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm', 154 '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
148 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm', 155 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
149 '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm', 156 '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
150 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm', 157 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
151 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm', 158 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
152 '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm', 159 '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
153 '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm', 160 '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
154 '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm', 161 '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
155 ], 162 ],
156 }], 163 }],
157 [ 'skia_arch_type == "x86_64"', { 164 [ 'skia_arch_type == "x86_64" and skia_os != "android"', {
158 'sources': [ 165 'sources': [
159 '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c', 166 '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
160 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm', 167 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
161 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm', 168 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
162 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm', 169 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
163 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm', 170 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
164 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm', 171 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
165 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm', 172 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
166 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm', 173 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
167 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm', 174 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 ], 342 ],
336 'process_outputs_as_sources': 1, 343 'process_outputs_as_sources': 1,
337 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 344 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
338 }], 345 }],
339 ] 346 ]
340 }, 347 },
341 ], 348 ],
342 }, 349 },
343 ], 350 ],
344 } 351 }
OLDNEW
« 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