auto merge of #3987 : mbrubeck/servo/rust-root, r=larsbergstrom

r? @larsbergstrom
This commit is contained in:
bors-servo 2014-11-17 09:21:28 -07:00
commit 2bda68f038
2 changed files with 3 additions and 1 deletions

View file

@ -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 \