From 0c0c04f3e80e6f37ec2844a7c834bd87fb9f3254 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 8 Jan 2015 13:25:24 +0530 Subject: [PATCH 1/2] Silence warnings from openssl --- support/android/openssl.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/support/android/openssl.sh b/support/android/openssl.sh index 201503ea451..c2992863e9f 100755 --- a/support/android/openssl.sh +++ b/support/android/openssl.sh @@ -183,6 +183,9 @@ fi cd openssl-1.0.1j 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 From a8326a9138e25e4aa38645a2b83d824443903a18 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 8 Jan 2015 13:28:35 +0530 Subject: [PATCH 2/2] Fix dead code warning for Android --- ports/glutin/window.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index a5156f6d714..80a619e360f 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -38,6 +38,7 @@ use util::cursor::Cursor; use std::ptr; struct HeadlessContext { + #[allow(dead_code)] context: glutin::HeadlessContext, size: TypedSize2D, }