From 51998d22b0472865fa70edbf00edfce4861c3364 Mon Sep 17 00:00:00 2001
From: Seo Sanghyeon <sanxiyn@gmail.com>
Date: Mon, 16 Sep 2013 23:09:50 +0900
Subject: [PATCH 1/2] Pass OS to gyp_uv

---
 mk/rt.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/rt.mk b/mk/rt.mk
index e31f2228e3f7..35ee42f9cb4e 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -102,15 +102,15 @@ else ifeq ($(OSTYPE_$(1)), apple-darwin)
   LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
   JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
 else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
-  LIBUV_OSTYPE_$(1)_$(2) := unix/freebsd
+  LIBUV_OSTYPE_$(1)_$(2) := freebsd
   LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
   JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
 else ifeq ($(OSTYPE_$(1)), linux-androideabi)
-  LIBUV_OSTYPE_$(1)_$(2) := unix/android
+  LIBUV_OSTYPE_$(1)_$(2) := android
   LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
   JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
 else
-  LIBUV_OSTYPE_$(1)_$(2) := unix/linux
+  LIBUV_OSTYPE_$(1)_$(2) := linux
   LIBUV_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/libuv/libuv.a
   JEMALLOC_LIB_$(1)_$(2) := $$(RT_BUILD_DIR_$(1)_$(2))/jemalloc/lib/libjemalloc_pic.a
 endif
@@ -178,6 +178,7 @@ export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib
 $$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_DEPS)
 	(cd $(S)src/libuv/ && \
 	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
+	   -DOS=$$(LIBUV_OSTYPE_$(1)_$(2)) \
 	   -Goutput_dir=$$(@D) --generator-output $$(@D))
 
 # XXX: Shouldn't need platform-specific conditions here

From 942bc3161ed380ee7873b11fb4ba53d45476ca32 Mon Sep 17 00:00:00 2001
From: Seo Sanghyeon <sanxiyn@gmail.com>
Date: Mon, 16 Sep 2013 23:10:01 +0900
Subject: [PATCH 2/2] Ignore failing tests on Android

---
 src/test/run-pass/packed-struct-vec.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/run-pass/packed-struct-vec.rs
index 930ef17dbf5f..e66c4619b3ca 100644
--- a/src/test/run-pass/packed-struct-vec.rs
+++ b/src/test/run-pass/packed-struct-vec.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-android: FIXME(#9116) Bus error
+
 use std::sys;
 
 #[packed]