Merge pull request #3262 from mbrubeck/cargo

Cargo fixes
servo · Sep 10, 2014 · aafab19 · aafab19
2 parents 5a1db0d + 1583088
commit aafab19
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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" \

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
@@ -39,6 +39,8 @@ def build(self, target, release=False, jobs=None):
         opts = []
         if release:
             opts += ["--release"]
+        if target:
+            opts += ["--target", target]
         if jobs is not None:
             opts += ["-j", jobs]
 

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