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

auto merge of #1530 : larsbergstrom/servo/android_fixups, r=metajack

Browse source 
These two fixes are required for Android. We need to generate a toplevel crate map because it is used by both debugging and the libuv stuff. We also need to manually link against rustuv because we cannot dynamically inject it on Android.

r? @metajack
This commit is contained in:
bors-servo 2014-01-22 13:13:26 -08:00
commit 4fcb48da64
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -332,7 +332,7 @@ servo: $(DEPS_servo)
else else
servo: $(DEPS_servo) servo: $(DEPS_servo)
@$(call E, compile: $@) @$(call E, compile: $@)
$(Q)$(RUSTC) $(RFLAGS_servo) -o $@ $< --lib $(Q)$(RUSTC) $(RFLAGS_servo) -o -Z gen-crate-map $@ $< --lib
endif endif
# Darwin app packaging # Darwin app packaging

2
src/components/main/servo.rc
View file

@ -20,6 +20,8 @@ extern mod js;
extern mod layers; extern mod layers;
extern mod opengles; extern mod opengles;
extern mod png; extern mod png;
#[cfg(target_os="android")]
extern mod rustuv;
extern mod script; extern mod script;
extern mod servo_net = "net"; extern mod servo_net = "net";
extern mod servo_msg = "msg"; extern mod servo_msg = "msg";