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

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

Issue 1249083004: Fix Android x86 compile on mac (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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 }], 333 }],
334 ], 334 ],
335 }, 335 },
336 }], 336 }],
337 ], 337 ],
338 'rules': [ 338 'rules': [
339 { 339 {
340 'rule_name': 'assemble', 340 'rule_name': 'assemble',
341 'extension': 'asm', 341 'extension': 'asm',
342 'conditions': [ 342 'conditions': [
343 [ 'skia_arch_type == "x86" or skia_arch_type == "x86_64"', { 343 [ '(skia_arch_type == "x86" or skia_arch_type == "x86_64") and \
344 (skia_os != "android" or host_os == "linux")', {
344 'inputs': [], 345 'inputs': [],
345 'outputs': [ 346 'outputs': [
346 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)', 347 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
347 ], 348 ],
348 'action': [ 349 'action': [
349 '<(yasm_path)', 350 '<(yasm_path)',
350 '<(yasm_format)', 351 '<(yasm_format)',
351 '<@(yasm_flags)', 352 '<@(yasm_flags)',
352 '-DRGBX_FILLER_0XFF', 353 '-DRGBX_FILLER_0XFF',
353 '-DSTRICT_MEMORY_ACCESS', 354 '-DSTRICT_MEMORY_ACCESS',
354 '-Isimd/', 355 '-Isimd/',
355 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffi x)', 356 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffi x)',
356 '<(RULE_INPUT_PATH)', 357 '<(RULE_INPUT_PATH)',
357 ], 358 ],
358 'process_outputs_as_sources': 1, 359 'process_outputs_as_sources': 1,
359 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)', 360 'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
360 }], 361 }],
361 ] 362 ]
362 }, 363 },
363 ], 364 ],
364 }, 365 },
365 ], 366 ],
366 } 367 }
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