diff options
| author |  msarett <msarett@google.com> | 2015-07-23 11:57:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-23 11:57:13 -0700 |
| commit | a56884c17fb02ae416ce875da3b1eddc7e6d81ae (patch) | |
| tree | 80f5f1f2867e7d82605ba37cb80014e21ea14425 /gyp | |
| parent | 4e34001ec0828b9f0cf211bd143249aef65dfe1e (diff) | |
Fix Android x86 compile on mac
It appears I failed to fully disable it on the first attempt.
BUG=skia:
Review URL: https://codereview.chromium.org/1249083004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/libjpeg-turbo.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp index 7ff763427b..4dcea626de 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)', |