diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 05:03:14 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 05:03:14 +0000 |
| commit | 9176b2bb0b94f5677d1bc9a4a9319b1ca00a679e (patch) | |
| tree | 2d92f49f604d186538b6d16a94a94d7c835e6ede /base | |
| parent | 481ea089990e768d771a02434f031bb38971f325 (diff) | |
| download | chromium_src-9176b2bb0b94f5677d1bc9a4a9319b1ca00a679e.zip chromium_src-9176b2bb0b94f5677d1bc9a4a9319b1ca00a679e.tar.gz chromium_src-9176b2bb0b94f5677d1bc9a4a9319b1ca00a679e.tar.bz2 | |
Revert 135087 - 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=
Review URL: http://codereview.chromium.org/10271039
TBR=james.wei@intel.com
Review URL: https://chromiumcodereview.appspot.com/10331008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/base/base.gypi b/base/base.gypi index 4c96ebd..c5fb4cc 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -686,13 +686,6 @@ ], }], [ 'OS == "android" and _toolset == "target"', { - 'conditions': [ - ['target_arch == "ia32"', { - 'sources/': [ - ['include', '^atomicops_internals_x86_gcc\\.cc$'], - ], - }], - ], 'dependencies': [ 'symbolize', '../third_party/ashmem/ashmem.gyp:ashmem', |