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
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index de27b42..af54f6e 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 a611d30..245babb 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',
],