From bd53792269d53822bccc2fa5819cc3f2182d8fd0 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 25 Aug 2015 16:31:58 +0200 Subject: [PATCH 1/2] Fix the CEF build. --- ports/cef/browser.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cef/browser.rs b/ports/cef/browser.rs index 14c08848765..deb63d06a3b 100644 --- a/ports/cef/browser.rs +++ b/ports/cef/browser.rs @@ -227,7 +227,7 @@ pub fn get_null_window_handle() -> cef_window_handle_t { pub fn update() { BROWSERS.with(|browsers| { - for browser in &browsers.borrow() { + for browser in &*browsers.borrow() { if browser.downcast().callback_executed.get() == false { browser_callback_after_created(browser.clone()); } From 13086abfdc6e7bd2c714b1e832ebe73eb3495cf7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 25 Aug 2015 16:32:51 +0200 Subject: [PATCH 2/2] Check the return code of cargo build (except on Android). --- python/servo/build_commands.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 796b23105d0..d49632882e5 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -115,7 +115,7 @@ def call(*args, **kwargs): verbose = kwargs.pop('verbose', False) if verbose: print(' '.join(args[0])) - subprocess.call(*args, **kwargs) + return subprocess.call(*args, **kwargs) @CommandProvider @@ -195,7 +195,9 @@ class MachCommands(CommandBase): # Ensure the APK builder submodule has been built first apk_builder_dir = "support/android-rs-glue" 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"] @@ -240,6 +242,9 @@ class MachCommands(CommandBase): notify_build_done(elapsed) print("Build completed in %0.2fs" % elapsed) + # XXX(#7339) Android build is broken + if android: + return 0 return status @Command('build-cef',