Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the correct Rust path in Android packaging

Browse source
This commit is contained in:
Matt Brubeck 2014-11-14 13:01:39 -08:00
parent 85a2f0b66a
commit 3cacb029cc
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ports/android/Makefile
View file

@ -1,4 +1,5 @@
CARGO_OPTS ?= CARGO_OPTS ?=
RUST_ROOT ?= /usr/local
.PHONY: all .PHONY: all
all: glut_app all: glut_app
@ -7,7 +8,7 @@ all: glut_app
xargs -I {} cp -f {} libs/armeabi xargs -I {} cp -f {} libs/armeabi
find glut_app/target ! \( -type d -name dist -prune \) -name 'libglut_app-*.so' | \ find glut_app/target ! \( -type d -name dist -prune \) -name 'libglut_app-*.so' | \
xargs -I {} cp -f {} libs/armeabi/libservo.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 | \ -name '*.so' -type f -size +1c | \
xargs -I {} cp -f {} libs/armeabi xargs -I {} cp -f {} libs/armeabi
$(ANDROID_SDK)/tools/android update project \ $(ANDROID_SDK)/tools/android update project \

1
python/servo/command_base.py
View file

@ -109,6 +109,7 @@ class CommandBase(object):
extra_lib = [] extra_lib = []
if not self.config["tools"]["system-rust"] \ if not self.config["tools"]["system-rust"] \
or self.config["tools"]["rust-root"]: 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_path += [path.join(self.config["tools"]["rust-root"], "bin")]
extra_lib += [path.join(self.config["tools"]["rust-root"], "lib")] extra_lib += [path.join(self.config["tools"]["rust-root"], "lib")]
if not self.config["tools"]["system-cargo"] \ if not self.config["tools"]["system-cargo"] \