AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Android x86 compile on mac

Browse Source 
It appears I failed to fully disable it on the first attempt.

BUG=skia:

Review URL: https://codereview.chromium.org/1249083004
This commit is contained in:
msarett 2015-07-23 11:57:13 -07:00 committed by Commit bot
parent 4e34001ec0
commit a56884c17f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gyp/libjpeg-turbo.gyp
View File

@ -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)',