gyp/libjpeg-turbo.gyp - Issue 1249083004: Fix Android x86 compile on mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: gyp/libjpeg-turbo.gyp

diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp

index 7ff763427b96bd0df2eec5cc32ff094f75233844..4dcea626ded2f5d75d5101cd95353fe8b2ce3ed9 100644

--- a/gyp/libjpeg-turbo.gyp

+++ b/gyp/libjpeg-turbo.gyp

@@ -340,7 +340,8 @@

'rule_name': 'assemble',

'extension': 'asm',

'conditions': [

- [ 'skia_arch_type == "x86" or skia_arch_type == "x86_64"', {

+ [ '(skia_arch_type == "x86" or skia_arch_type == "x86_64") and \

+ (skia_os != "android" or host_os == "linux")', {

'inputs': [],

'outputs': [

'<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',

« no previous file with comments | « no previous file | no next file » | no next file with comments »