diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-18 15:21:54 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-18 15:21:54 +0000 |
| commit | 98d97fc0bb40005549503c756db86ff572f159f3 (patch) | |
| tree | 2d549e8a8d016d479090188e65f3430fb59e642f /gyp | |
| parent | b7a00ba537be5814a8fcbf87e7f493e6ca81e27c (diff) | |
Fix gyp files when building Android for x86
BUG=606
Review URL: https://codereview.appspot.com/7086053
git-svn-id: http://skia.googlecode.com/svn/trunk@7271 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/opts.gyp | 8 | ||||
| -rw-r--r-- | gyp/skia_base_libs.gyp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index de27b42588..af54f6eac3 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -37,6 +37,11 @@ '-msse2', ], }], + [ 'skia_os != "android"', { + 'dependencies': [ + 'opts_ssse3', + ], + }], ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', @@ -45,9 +50,6 @@ '../src/opts/SkBlitRect_opts_SSE2.cpp', '../src/opts/SkUtils_opts_SSE2.cpp', ], - 'dependencies': [ - 'opts_ssse3', - ], }], [ 'skia_arch_type == "arm" and armv7 == 1', { # The assembly uses the frame pointer register (r7 in Thumb/r11 in diff --git a/gyp/skia_base_libs.gyp b/gyp/skia_base_libs.gyp index a611d30d0d..245babbccf 100644 --- a/gyp/skia_base_libs.gyp +++ b/gyp/skia_base_libs.gyp @@ -8,7 +8,7 @@ 'utils.gyp:utils', ], 'conditions': [ - [ 'skia_arch_type == "x86"', { + [ 'skia_arch_type == "x86" and skia_os != "android"', { 'component_libs': [ 'opts.gyp:opts_ssse3', ], |