From 965ba08c75190d2ebce573552ca8ad267c571e62 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Sep 2014 14:56:51 -0700
Subject: [PATCH 1/4] Pass --target option from mach to cargo

---
 python/servo/build_commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index b0f4ab95b64..0ba0e0343bb 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -39,6 +39,8 @@ class MachCommands(CommandBase):
         opts = []
         if release:
             opts += ["--release"]
+        if target:
+            opts += ["--target", target]
         if jobs is not None:
             opts += ["-j", jobs]
 

From 0d19453290043ecf96fe3219d00140146b699cb9 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Sep 2014 14:57:26 -0700
Subject: [PATCH 2/4] Fix typo in 'mach cargo --help'

---
 python/servo/devenv_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index 1c5c8ee24b5..d076330ee4e 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -26,7 +26,7 @@ class MachCommands(CommandBase):
              category='devenv',
              allow_all_args=True)
     @CommandArgument('params', default=None, nargs='...',
-                     help="Command-line arguments to be passed through to Cervo")
+                     help="Command-line arguments to be passed through to Cargo")
     def run(self, params):
         return subprocess.call(["cargo"] + params,
                                env=self.build_env())

From de849f27c1c40cc2170f48c9e8a72e9bc58d801f Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Sep 2014 15:13:30 -0700
Subject: [PATCH 3/4] Update fontconfig

Picks up servo/libfontconfig#2.
---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8259bd7ba34..03a7ffe6f8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,13 +125,13 @@ name = "fontconfig"
 version = "0.1.0"
 source = "git+https://github.com/servo/rust-fontconfig#6e02b6df7815dc4bf1f8ef20b926e717891f8544"
 dependencies = [
- "fontconfig-sys 2.11.1 (git+https://github.com/servo/libfontconfig#1fc43065f581d70133d819070177094434cc3144)",
+ "fontconfig-sys 2.11.1 (git+https://github.com/servo/libfontconfig#fcc324d2c8175d2e8e8c0aab032c03a404809f6d)",
 ]
 
 [[package]]
 name = "fontconfig-sys"
 version = "2.11.1"
-source = "git+https://github.com/servo/libfontconfig#1fc43065f581d70133d819070177094434cc3144"
+source = "git+https://github.com/servo/libfontconfig#fcc324d2c8175d2e8e8c0aab032c03a404809f6d"
 dependencies = [
  "expat-sys 2.1.0 (git+https://github.com/servo/libexpat#da2ddaf78cbef836b8790807bb76b357c58df3a1)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2#5b6499164106f094937565595c7b96d07de55521)",

From 158308894a04d1813c64093ccfd6555165a04d3f Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Tue, 9 Sep 2014 16:42:11 -0700
Subject: [PATCH 4/4] Remove reference to old extlibs dir

---
 ports/android/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/android/Makefile b/ports/android/Makefile
index d4fe5eb580f..6328462c60b 100644
--- a/ports/android/Makefile
+++ b/ports/android/Makefile
@@ -8,7 +8,6 @@ all:
 	find ../../rust/lib/rustlib/arm-linux-androideabi/lib \
 		-name '*.so' -type f -size +1c | \
 		xargs -I {} cp -f {} libs/armeabi
-	cp -a extlibs/* libs/armeabi
 	$(ANDROID_SDK)/tools/android update project \
 		--name ServoAndroid \
 		--target "android-18" \