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

Issues Search
    My Issues | Starred     Open | Closed | All

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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
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': [
djsollen 2015/07/09 14:09:18 skia_os = "android && (skia_arch_type == "x86" or
msarett 2015/07/09 14:18:17 Done.
119 [ 'skia_arch_type == "x86"', { 119 [ 'skia_arch_type == "x86"', {
djsollen 2015/07/09 14:09:18 and skia_os != android
msarett 2015/07/09 14:18:17 Done.
120 'sources': [ 120 # FIXME (msarett): Reenable yasm on Android for x86 and x86_64
121 '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c', 121 # https://code.google.com/p/skia/issues/detail?id=4028
122 '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm', 122 'conditions': [
123 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm', 123 [ 'skia_os == "android"', {
124 '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm', 124 'sources': [
125 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm', 125 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
126 '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm', 126 ],
127 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm', 127 }, {
128 '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm', 128 'sources': [
129 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm', 129 '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
130 '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm', 130 '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
131 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm', 131 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
132 '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm', 132 '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
133 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm', 133 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
134 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm', 134 '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
135 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm', 135 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
136 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm', 136 '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
137 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm', 137 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
138 '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm', 138 '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
139 '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm', 139 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
140 '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm', 140 '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
141 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm', 141 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
142 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm', 142 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
143 '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm', 143 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
144 '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm', 144 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
145 '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm', 145 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
146 '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm', 146 '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
147 '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm', 147 '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
148 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm', 148 '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
149 '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm', 149 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
150 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm', 150 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
151 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm', 151 '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
152 '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm', 152 '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
153 '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm', 153 '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
154 '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm', 154 '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
155 '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
156 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
157 '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
158 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
159 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
160 '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
161 '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
162 '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
163 ],
164 }],
155 ], 165 ],
156 }], 166 }],
157 [ 'skia_arch_type == "x86_64"', { 167 [ 'skia_arch_type == "x86_64"', {
158 'sources': [ 168 'conditions': [
159 '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c', 169 [ 'skia_os == "android"', {
160 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm', 170 'sources': [
161 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm', 171 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
162 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm', 172 ],
163 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm', 173 }, {
164 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm', 174 'sources': [
165 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm', 175 '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
166 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm', 176 '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm ',
167 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm', 177 '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm' ,
168 '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.asm', 178 '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.as m',
169 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.asm', 179 '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm ',
170 '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.asm', 180 '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm ',
171 '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.asm', 181 '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.as m',
172 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.asm', 182 '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm ',
173 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm', 183 '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.as m',
174 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm', 184 '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2-64.as m',
185 '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2-64.as m',
186 '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2-64.as m',
187 '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2-64.as m',
188 '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2-64.as m',
189 '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2-64.asm ',
190 '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2-64.asm ',
191 ],
192 }],
175 ], 193 ],
176 }], 194 }],
177 [ 'skia_arch_type == "arm64"', { 195 [ 'skia_arch_type == "arm64"', {
178 'sources': [ 196 'sources': [
179 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c', 197 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c',
180 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64_neon.S', 198 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64_neon.S',
181 ], 199 ],
182 }], 200 }],
183 [ 'skia_arch_type == "arm"', { 201 [ 'skia_arch_type == "arm"', {
184 'conditions': [ 202 'conditions': [
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 ], 353 ],
336 'process_outputs_as_sources': 1, 354 'process_outputs_as_sources': 1,
337 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 355 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
338 }], 356 }],
339 ] 357 ]
340 }, 358 },
341 ], 359 ],
342 }, 360 },
343 ], 361 ],
344 } 362 }
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