Commit a20b15ba authored by agl@chromium.org's avatar agl@chromium.org

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
parent 609a2c8e
...@@ -85,7 +85,7 @@ vars = { ...@@ -85,7 +85,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
"boringssl_revision": "2f1f89d6afefb89aa19257b5c624e3b3eb15203d", "boringssl_revision": "09020c2f08df11179b93e6548117806a4c0d0d45",
} }
deps = { deps = {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
['OS == "mac"', { ['OS == "mac"', {
'sources': [ '<@(boringssl_mac_x86_sources)' ], 'sources': [ '<@(boringssl_mac_x86_sources)' ],
}], }],
['OS == "linux"', { ['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_x86_sources)' ], 'sources': [ '<@(boringssl_linux_x86_sources)' ],
}], }],
['OS != "mac" and OS != "linux"', { ['OS != "mac" and OS != "linux"', {
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
['OS == "mac"', { ['OS == "mac"', {
'sources': [ '<@(boringssl_mac_x86_64_sources)' ], 'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
}], }],
['OS == "linux"', { ['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_x86_64_sources)' ], 'sources': [ '<@(boringssl_linux_x86_64_sources)' ],
}], }],
['OS == "win"', { ['OS == "win"', {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment