Merge pull request #3262 from mbrubeck/cargo

Cargo fixes

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)",

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" \

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]
 

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())