mirror of
https://github.com/servo/servo.git
synced 2025-07-23 15:23:42 +01:00
auto merge of #4570 : Manishearth/servo/android-warn, r=jdm
My local android build is a bit wonky so I'm not sure if all warnings have been fixed, though. I'll try to poke around and fix it.
This commit is contained in:
commit
d9751c0fbb
2 changed files with 7 additions and 3 deletions
|
@ -33,6 +33,7 @@ use util::cursor::Cursor;
|
|||
use std::ptr;
|
||||
|
||||
struct HeadlessContext {
|
||||
#[allow(dead_code)]
|
||||
context: glutin::HeadlessContext,
|
||||
size: TypedSize2D<DevicePixel, uint>,
|
||||
}
|
||||
|
|
|
@ -183,6 +183,9 @@ fi
|
|||
|
||||
cd openssl-1.0.1k
|
||||
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
|
||||
./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API
|
||||
make depend
|
||||
make all
|
||||
|
||||
# The code being built isn't maintained by us, so we redirect stderr to stdout
|
||||
# so that the warnings don't clutter up buildbot
|
||||
./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API 2>&1
|
||||
make depend 2>&1
|
||||
make all 2>&1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue