mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
auto merge of #1530 : larsbergstrom/servo/android_fixups, r=metajack
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:
commit
4fcb48da64
2 changed files with 3 additions and 1 deletions
|
@ -332,7 +332,7 @@ servo: $(DEPS_servo)
|
|||
else
|
||||
servo: $(DEPS_servo)
|
||||
@$(call E, compile: $@)
|
||||
$(Q)$(RUSTC) $(RFLAGS_servo) -o $@ $< --lib
|
||||
$(Q)$(RUSTC) $(RFLAGS_servo) -o -Z gen-crate-map $@ $< --lib
|
||||
endif
|
||||
|
||||
# Darwin app packaging
|
||||
|
|
|
@ -20,6 +20,8 @@ extern mod js;
|
|||
extern mod layers;
|
||||
extern mod opengles;
|
||||
extern mod png;
|
||||
#[cfg(target_os="android")]
|
||||
extern mod rustuv;
|
||||
extern mod script;
|
||||
extern mod servo_net = "net";
|
||||
extern mod servo_msg = "msg";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue