Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4570 : Manishearth/servo/android-warn, r=jdm

Browse source 
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:
bors-servo 2015-01-08 21:54:48 -07:00
commit d9751c0fbb
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ports/glutin/window.rs
View file

@ -33,6 +33,7 @@ use util::cursor::Cursor;
use std::ptr; use std::ptr;
struct HeadlessContext { struct HeadlessContext {
#[allow(dead_code)]
context: glutin::HeadlessContext, context: glutin::HeadlessContext,
size: TypedSize2D<DevicePixel, uint>, size: TypedSize2D<DevicePixel, uint>,
} }

9
support/android/openssl.sh
View file

@ -183,6 +183,9 @@ fi
cd openssl-1.0.1k cd openssl-1.0.1k
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org 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 # The code being built isn't maintained by us, so we redirect stderr to stdout
make all # 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