diff options
| author | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 09:17:45 +0000 |
|---|---|---|
| committer | james.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 09:17:45 +0000 |
| commit | febd35713413ba071b939d5908fc62f92550cb08 (patch) | |
| tree | 8db7e02c543664144eb4eed046f2da3a7b68eaf9 /skia | |
| parent | ad031091afa495bea20ea838aa86b693af2f31b2 (diff) | |
| download | chromium_src-febd35713413ba071b939d5908fc62f92550cb08.zip chromium_src-febd35713413ba071b939d5908fc62f92550cb08.tar.gz chromium_src-febd35713413ba071b939d5908fc62f92550cb08.tar.bz2 | |
This patch is to enable x86 android build.
patch includes two parts:
1. gyp files modification to include x86 android build.
2. add android config files for yasm which is copied from linux ones. enable android x86 build
This patch is cloned from the issue #10198027 for ownership issue.
https://chromiumcodereview.appspot.com/10198027/
BUG=125160
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=135087
Review URL: http://codereview.chromium.org/10271039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia.gyp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index a1c6d1f..106cd54 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -1099,8 +1099,13 @@ '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', ], - 'dependencies': [ - 'skia_opts_ssse3', + 'conditions': [ + # x86 Android doesn't support SSSE3 instructions. + [ 'OS != "android"', { + 'dependencies': [ + 'skia_opts_ssse3', + ], + }], ], }, { # arm |