From 00e5f010d4f533b5cf1189ed7937c04aaf3cf02d Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Tue, 8 Apr 2014 18:58:29 -0500
Subject: [PATCH] Update the configuration files to properly build rust. Revert
 rust-stb-image submodule misupdate.

---
 Makefile.in                             | 6 ++++++
 configure                               | 1 -
 src/compiler/rust                       | 2 +-
 src/components/main/layout/context.rs   | 6 +++---
 src/components/main/servo.rs            | 4 ++--
 src/platform/android/servo-android-glue | 2 +-
 src/support/egl/rust-egl                | 2 +-
 src/support/layers/rust-layers          | 2 +-
 src/support/stb-image/rust-stb-image    | 2 +-
 9 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d8619e8bd8b..21b5e1d15c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,6 +107,12 @@ $(B)src/compiler/rust/rust-auto-clean-stamp: $(S)src/compiler/rust-auto-clean-tr
 
 rust: $(CFG_RUSTC)
 
+# These arguments are automatically provided by the Rust compiler's build process to
+# itself, so they must be specified later for our Rust modules.
+ifeq ($(CFG_OSTYPE),linux-androideabi)
+  CFG_RUSTC_FLAGS += --target arm-linux-androideabi -C android-cross-path=$(CFG_ANDROID_CROSS_PATH)
+endif
+
 # Strip off submodule paths to determine "raw" submodule names.
 SUBMODULES=$(shell echo $(CFG_SUBMODULES) | perl -p -e 's![A-Za-z0-9_-]+/!!g')
 
diff --git a/configure b/configure
index ad101f6201f..a460952b47a 100755
--- a/configure
+++ b/configure
@@ -385,7 +385,6 @@ case ${TARGET_OSTYPE} in
         probe CFG_RANLIB	       arm-linux-androideabi-ranlib
 
         export PATH=${OLD_PATH}
-        CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} -C android-cross-path=${CFG_ANDROID_CROSS_PATH}"
         ;;
     *)
         CFG_PATH=$PATH
diff --git a/src/compiler/rust b/src/compiler/rust
index d6811bc1bde..aa39d755e3f 160000
--- a/src/compiler/rust
+++ b/src/compiler/rust
@@ -1 +1 @@
-Subproject commit d6811bc1bdeb66381af4b9bf3e4ff77b3cee27f6
+Subproject commit aa39d755e3f9823b51cc57761c0c8c75759aca2e
diff --git a/src/components/main/layout/context.rs b/src/components/main/layout/context.rs
index a43fff40119..512e71aca7a 100644
--- a/src/components/main/layout/context.rs
+++ b/src/components/main/layout/context.rs
@@ -37,7 +37,7 @@ use std::local_data;
 static mut FONT_CONTEXT: *mut FontContext = 0 as *mut FontContext;
 
 #[cfg(target_os="android")]
-local_data_key!(font_context: * mut FontContext)
+local_data_key!(font_context: *mut FontContext)
 
 #[cfg(not(target_os="android"))]
 #[thread_local]
@@ -45,7 +45,7 @@ static mut APPLICABLE_DECLARATIONS_CACHE: *mut ApplicableDeclarationsCache =
     0 as *mut ApplicableDeclarationsCache;
 
 #[cfg(target_os="android")]
-local_data_key!(applicable_declarations_cache: * mut ApplicableDeclarationsCache)
+local_data_key!(applicable_declarations_cache: *mut ApplicableDeclarationsCache)
 
 #[cfg(not(target_os="android"))]
 #[thread_local]
@@ -53,7 +53,7 @@ static mut STYLE_SHARING_CANDIDATE_CACHE: *mut StyleSharingCandidateCache =
     0 as *mut StyleSharingCandidateCache;
 
 #[cfg(target_os="android")]
-local_data_key!(style_sharing_candidate_cache: * mut StyleSharingCandidateCache)
+local_data_key!(style_sharing_candidate_cache: *mut StyleSharingCandidateCache)
 
 /// Data shared by all layout workers.
 #[deriving(Clone)]
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index c52ae877f6c..562cd71ce28 100755
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -67,8 +67,8 @@ use servo_util::opts;
 #[cfg(not(test))]
 use servo_util::url::parse_url;
 
-#[cfg(not(test), target_os="linux")]
-#[cfg(not(test), target_os="macos")]
+
+#[cfg(not(test), not(target_os="android"))]
 use std::os;
 #[cfg(not(test), target_os="android")]
 use std::str;
diff --git a/src/platform/android/servo-android-glue b/src/platform/android/servo-android-glue
index 89757a91ba1..0941b770238 160000
--- a/src/platform/android/servo-android-glue
+++ b/src/platform/android/servo-android-glue
@@ -1 +1 @@
-Subproject commit 89757a91ba1b012cb003ceb60a121226f5646c02
+Subproject commit 0941b7702380d57ffe95823cfb057d752fd150ae
diff --git a/src/support/egl/rust-egl b/src/support/egl/rust-egl
index c2b23d8aa8d..ffb1be4fecb 160000
--- a/src/support/egl/rust-egl
+++ b/src/support/egl/rust-egl
@@ -1 +1 @@
-Subproject commit c2b23d8aa8dc857536b1b68cf6646a1e11517161
+Subproject commit ffb1be4fecbfadacd02e5a714025bc58e6833f27
diff --git a/src/support/layers/rust-layers b/src/support/layers/rust-layers
index 42f6584fff2..10d40153462 160000
--- a/src/support/layers/rust-layers
+++ b/src/support/layers/rust-layers
@@ -1 +1 @@
-Subproject commit 42f6584fff271939f9eb7af031710ff4b65df464
+Subproject commit 10d40153462cf7248fcf35db5c18cf026cd25aea
diff --git a/src/support/stb-image/rust-stb-image b/src/support/stb-image/rust-stb-image
index a2671a7aec3..064e33d8217 160000
--- a/src/support/stb-image/rust-stb-image
+++ b/src/support/stb-image/rust-stb-image
@@ -1 +1 @@
-Subproject commit a2671a7aec350a85f5de5b4838cbc500ecb03720
+Subproject commit 064e33d8217424a33636c8019b1f1f74a44ee2bb