mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Use the correct Rust path in Android packaging
This commit is contained in:
parent
85a2f0b66a
commit
3cacb029cc
2 changed files with 3 additions and 1 deletions
|
@ -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 \
|
||||
|
|
|
@ -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"] \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue