diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 17:18:47 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 17:18:47 +0000 |
| commit | a20b15ba0cb5cb8733789c46e8d0f79ea0d272b9 (patch) | |
| tree | 77b897d43d55584379691d66db0eaef91356c726 /third_party | |
| parent | 609a2c8e8fe0989d754e8557618cca18d58074d4 (diff) | |
| download | chromium_src-a20b15ba0cb5cb8733789c46e8d0f79ea0d272b9.zip chromium_src-a20b15ba0cb5cb8733789c46e8d0f79ea0d272b9.tar.gz chromium_src-a20b15ba0cb5cb8733789c46e8d0f79ea0d272b9.tar.bz2 | |
boringssl: MIPS and Android build tweaks.
This change causes Android to build with Linux asm files and also bumps the
BoringSSL revision in order to pull in a change to define MIPS as a generic,
32-bit CPU.
BUG=392745
R=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/387583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/boringssl/boringssl.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp index 4347e99..ba87066 100644 --- a/third_party/boringssl/boringssl.gyp +++ b/third_party/boringssl/boringssl.gyp @@ -25,7 +25,7 @@ ['OS == "mac"', { 'sources': [ '<@(boringssl_mac_x86_sources)' ], }], - ['OS == "linux"', { + ['OS == "linux" or OS == "android"', { 'sources': [ '<@(boringssl_linux_x86_sources)' ], }], ['OS != "mac" and OS != "linux"', { @@ -38,7 +38,7 @@ ['OS == "mac"', { 'sources': [ '<@(boringssl_mac_x86_64_sources)' ], }], - ['OS == "linux"', { + ['OS == "linux" or OS == "android"', { 'sources': [ '<@(boringssl_linux_x86_64_sources)' ], }], ['OS == "win"', { |