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

Side by Side Diff: gyp/libjpeg-turbo.gyp

Issue 1965983002: Instruct yasm to compile position independent code on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 'yasm.gyp:yasm#host', 252 'yasm.gyp:yasm#host',
253 ], 253 ],
254 'variables': { 254 'variables': {
255 'yasm_path': '<(PRODUCT_DIR)/yasm', 255 'yasm_path': '<(PRODUCT_DIR)/yasm',
256 'conditions': [ 256 'conditions': [
257 [ 'skia_arch_type == "x86"', { 257 [ 'skia_arch_type == "x86"', {
258 'yasm_format': '-felf', 258 'yasm_format': '-felf',
259 'yasm_flags': [ 259 'yasm_flags': [
260 '-D__x86__', 260 '-D__x86__',
261 '-DELF', 261 '-DELF',
262 '-DPIC',
262 ], 263 ],
263 }, { 264 }, {
264 'yasm_format': '-felf64', 265 'yasm_format': '-felf64',
265 'yasm_flags': [ 266 'yasm_flags': [
266 '-D__x86_64__', 267 '-D__x86_64__',
267 '-DELF', 268 '-DELF',
269 '-DPIC',
268 ], 270 ],
269 }], 271 }],
270 ], 272 ],
271 }, 273 },
272 }], 274 }],
273 [ '(skia_os == "mac" or skia_os == "ios") and \ 275 [ '(skia_os == "mac" or skia_os == "ios") and \
274 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', { 276 (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
275 'dependencies': [ 277 'dependencies': [
276 'yasm.gyp:yasm#host', 278 'yasm.gyp:yasm#host',
277 ], 279 ],
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 ], 344 ],
343 'process_outputs_as_sources': 1, 345 'process_outputs_as_sources': 1,
344 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 346 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
345 }], 347 }],
346 ] 348 ]
347 }, 349 },
348 ], 350 ],
349 }, 351 },
350 ], 352 ],
351 } 353 }
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