diff options
| author |  scroggo <scroggo@google.com> | 2015-02-12 10:48:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 10:48:25 -0800 |
| commit | df1c3373fc198f465cb0077516993dd41f268416 (patch) | |
| tree | 5df85329712ed32721983b72a8db3f1e474899c6 /gyp/opts.gyp | |
| parent | 9d7ceca35064b71e13e498da7e641e69b97bf4cf (diff) | |
Don't use m32 cflag for x86_64.
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.
Except when we specifically want x86.
Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.
In gyp_to_android.py, create a separate var_dict for x86_64.
BUG=skia:3419
Review URL: https://codereview.chromium.org/916113002
Diffstat (limited to 'gyp/opts.gyp')
| -rw-r--r-- | gyp/opts.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 2fb1468f50..6ff900863c 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -1,3 +1,4 @@ +# Gyp file for building opts target. { # Source lists live in opts.gypi. This makes it easier to maintain our Chrome GYP/GN setup. # (To be honest, I'm not sure why we need to include common.gypi. I thought it was automatic.) @@ -26,7 +27,7 @@ '../include/utils', ], 'conditions': [ - [ 'skia_arch_type == "x86" and skia_os != "ios"', { + [ '"x86" in skia_arch_type and skia_os != "ios"', { 'cflags': [ '-msse2' ], 'dependencies': [ 'opts_ssse3', 'opts_sse41' ], 'sources': [ '<@(sse2_sources)' ], @@ -44,7 +45,9 @@ [ '(skia_arch_type == "arm" and arm_version < 7) \ or (skia_os == "ios") \ - or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', { + or (skia_os == "android" \ + and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \ + "arm64"])', { 'sources': [ '<@(none_sources)' ], }], |