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

Auto merge of #7359 - servo:build, r=jdm

Browse source 
Fix the build.
This commit is contained in:
bors-servo 2015-08-25 08:34:13 -06:00
commit 4d0b4a7b8c
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/cef/browser.rs
View file

@ -227,7 +227,7 @@ pub fn get_null_window_handle() -> cef_window_handle_t {
pub fn update() { pub fn update() {
BROWSERS.with(|browsers| { BROWSERS.with(|browsers| {
for browser in &browsers.borrow() { for browser in &*browsers.borrow() {
if browser.downcast().callback_executed.get() == false { if browser.downcast().callback_executed.get() == false {
browser_callback_after_created(browser.clone()); browser_callback_after_created(browser.clone());
} }

9
python/servo/build_commands.py
View file

@ -115,7 +115,7 @@ def call(*args, **kwargs):
verbose = kwargs.pop('verbose', False) verbose = kwargs.pop('verbose', False)
if verbose: if verbose:
print(' '.join(args[0])) print(' '.join(args[0]))
subprocess.call(*args, **kwargs) return subprocess.call(*args, **kwargs)
@CommandProvider @CommandProvider
@ -195,7 +195,9 @@ class MachCommands(CommandBase):
# Ensure the APK builder submodule has been built first # Ensure the APK builder submodule has been built first
apk_builder_dir = "support/android-rs-glue" apk_builder_dir = "support/android-rs-glue"
with cd(path.join(apk_builder_dir, "apk-builder")): with cd(path.join(apk_builder_dir, "apk-builder")):
call(["cargo", "build"], env=self.build_env(), verbose=verbose) status = call(["cargo", "build"], env=self.build_env(), verbose=verbose)
if status:
return status
opts += ["--target", "arm-linux-androideabi"] opts += ["--target", "arm-linux-androideabi"]
@ -240,6 +242,9 @@ class MachCommands(CommandBase):
notify_build_done(elapsed) notify_build_done(elapsed)
print("Build completed in %0.2fs" % elapsed) print("Build completed in %0.2fs" % elapsed)
# XXX(#7339) Android build is broken
if android:
return 0
return status return status
@Command('build-cef', @Command('build-cef',