diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2014-11-14 13:01:39 -0800 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2014-11-14 13:01:46 -0800 |
| commit | 3cacb029ccc111f01fe6268bc22ae5ce53757c4b (patch) | |
| tree | 4e98922c81cc593ec0c0b57cb3107aca0dd42dd4 | |
| parent | 85a2f0b66a32cfd6022b3e6cec6ec06f3b59baf1 (diff) | |
| download | servo-3cacb029ccc111f01fe6268bc22ae5ce53757c4b.tar.gz servo-3cacb029ccc111f01fe6268bc22ae5ce53757c4b.zip | |
Use the correct Rust path in Android packaging
| -rw-r--r-- | ports/android/Makefile | 3 | ||||
| -rw-r--r-- | python/servo/command_base.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/android/Makefile b/ports/android/Makefile index e23d4c8ee5e..b99354e98cb 100644 --- a/ports/android/Makefile +++ b/ports/android/Makefile @@ -1,4 +1,5 @@ CARGO_OPTS ?= +RUST_ROOT ?= /usr/local .PHONY: all all: glut_app @@ -7,7 +8,7 @@ all: glut_app xargs -I {} cp -f {} libs/armeabi find glut_app/target ! \( -type d -name dist -prune \) -name 'libglut_app-*.so' | \ xargs -I {} cp -f {} libs/armeabi/libservo.so - find ../../rust/lib/rustlib/arm-linux-androideabi/lib \ + find $(RUST_ROOT)/lib/rustlib/arm-linux-androideabi/lib \ -name '*.so' -type f -size +1c | \ xargs -I {} cp -f {} libs/armeabi $(ANDROID_SDK)/tools/android update project \ diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 96cf287b329..8dc872e8656 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -109,6 +109,7 @@ class CommandBase(object): extra_lib = [] if not self.config["tools"]["system-rust"] \ or self.config["tools"]["rust-root"]: + env["RUST_ROOT"] = self.config["tools"]["rust-root"] extra_path += [path.join(self.config["tools"]["rust-root"], "bin")] extra_lib += [path.join(self.config["tools"]["rust-root"], "lib")] if not self.config["tools"]["system-cargo"] \ |