Do not try to compile x86 and x86_64 .asm files on Android

Do not try to compile x86 and x86_64 .asm files on Android

This is currently only works on Linux hosts because we have checked
in a binary and does not work on Mac hosts.  We are disabling until
we find a suitable solution.

BUG=skia:4028
Committed: https://skia.googlesource.com/skia/+/72394ef87c2ea023d00d79cd65013e1688ea30d3

[msarett, 2015-07-09 13:47:10]

msarett@google.com changed reviewers:
+ djsollen@google.com

[djsollen, 2015-07-09 14:09:18]

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp
File gyp/libjpeg-turbo.gyp (right):

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp#newco...
gyp/libjpeg-turbo.gyp:118: 'conditions': [
skia_os = "android && (skia_arch_type == "x86" or skia_arch_type == "x86_64")
   none

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp#newco...
gyp/libjpeg-turbo.gyp:119: [ 'skia_arch_type == "x86"', {
and skia_os != android

[msarett, 2015-07-09 14:18:17]

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp
File gyp/libjpeg-turbo.gyp (right):

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp#newco...
gyp/libjpeg-turbo.gyp:118: 'conditions': [
On 2015/07/09 14:09:18, djsollen wrote:
> skia_os = "android && (skia_arch_type == "x86" or skia_arch_type == "x86_64")
>    none

Done.

https://codereview.chromium.org/1228823006/diff/1/gyp/libjpeg-turbo.gyp#newco...
gyp/libjpeg-turbo.gyp:119: [ 'skia_arch_type == "x86"', {
On 2015/07/09 14:09:18, djsollen wrote:
> and skia_os != android

Done.

[djsollen, 2015-07-09 14:28:47]

lgtm with one nit

https://codereview.chromium.org/1228823006/diff/20001/gyp/libjpeg-turbo.gyp
File gyp/libjpeg-turbo.gyp (right):

https://codereview.chromium.org/1228823006/diff/20001/gyp/libjpeg-turbo.gyp#n...
gyp/libjpeg-turbo.gyp:119: 'conditions': [
this extra conditions block is overkill and it can be folded into the conditions
below.

[msarett, 2015-07-09 14:32:34]

https://codereview.chromium.org/1228823006/diff/20001/gyp/libjpeg-turbo.gyp
File gyp/libjpeg-turbo.gyp (right):

https://codereview.chromium.org/1228823006/diff/20001/gyp/libjpeg-turbo.gyp#n...
gyp/libjpeg-turbo.gyp:119: 'conditions': [
On 2015/07/09 14:28:47, djsollen wrote:
> this extra conditions block is overkill and it can be folded into the
conditions
> below.

Done.

[msarett, 2015-07-09 14:32:42]

The CQ bit was checked by msarett@google.com

[msarett, 2015-07-09 14:32:43]

The patchset sent to the CQ was uploaded after l-g-t-m from djsollen@google.com
Link to the patchset: https://codereview.chromium.org/1228823006/#ps40001
(title: " ")

[commit-bot: I haz the power, 2015-07-09 14:32:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1228823006/40001

[commit-bot: I haz the power, 2015-07-09 14:55:05]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/72394ef87c2ea023d00d79cd65013e1688ea30d3