From febd35713413ba071b939d5908fc62f92550cb08 Mon Sep 17 00:00:00 2001 From: "james.wei@intel.com" Date: Thu, 3 May 2012 09:17:45 +0000 Subject: 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 --- skia/skia.gyp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'skia') 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 -- cgit v1.1