diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-05 16:35:12 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-05 16:35:12 +0000 |
| commit | d4adfa37fb33fa0779da6401d7befbee14bb49df (patch) | |
| tree | 6284bb409a93e8f3b55dbae24ad0d438f7d46d2c /gyp/opts.gyp | |
| parent | 8a13588b6f41ba892bcf6e8ceef6b449c4a5d83d (diff) | |
Reland "Gyp file changes for the android framework."
Relands https://codereview.chromium.org/153093003/, which was reverted
with https://skia.googlesource.com/skia.git/+/eb6295044b97db05ec40625dcebc2459b2a38a98
This reverts commit 6b32be1402eb6c549d5ba1db71860e24f9de2991.
BUG=skia:1975
R=djsollen@google.com
Review URL: https://codereview.chromium.org/154053002
git-svn-id: http://skia.googlecode.com/svn/trunk@13321 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/opts.gyp')
| -rw-r--r-- | gyp/opts.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 83dfe14b04..9fe4023ea6 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -1,3 +1,4 @@ +# Gyp file for opts projects { 'targets': [ # Due to an unfortunate intersection of lameness between gcc and gyp, @@ -98,7 +99,9 @@ }], ], }], - [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { + [ '(skia_arch_type == "mips") or (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"])', { 'sources': [ '../src/opts/SkBitmapProcState_opts_none.cpp', '../src/opts/SkBlitMask_opts_none.cpp', |