diff options
| -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"] \ |