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

Disable gaol on arm targets

Browse source
This commit is contained in:
Bastien Orivel 2018-12-20 21:23:19 +01:00
parent 16beb65d49
commit 1d0af2dc8d
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/constellation/Cargo.toml
View file

@ -45,5 +45,5 @@ servo_url = {path = "../url"}
webvr_traits = {path = "../webvr_traits"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android")))'.dependencies]
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm")))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}

4
components/constellation/lib.rs
View file

@ -17,7 +17,7 @@ mod constellation;
mod event_loop;
mod network_listener;
mod pipeline;
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android")))]
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android"), not(target_arch="arm")))]
mod sandboxing;
mod session_history;
mod timer_scheduler;
@ -26,5 +26,5 @@ pub use crate::constellation::{
Constellation, FromCompositorLogger, FromScriptLogger, InitialConstellationState,
};
pub use crate::pipeline::UnprivilegedPipelineContent;
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android")))]
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android"), not(target_arch="arm")))]
pub use crate::sandboxing::content_process_sandbox_profile;

4
components/constellation/pipeline.rs
View file

@ -571,7 +571,7 @@ impl UnprivilegedPipelineContent {
}
}
#[cfg(target_os = "android")]
#[cfg(any(target_os = "android", target_arch="arm"))]
pub fn spawn_multiprocess(self) -> Result<(), Error> {
use ipc_channel::ipc::IpcOneShotServer;
// Note that this function can panic, due to process creation,
@ -593,7 +593,7 @@ impl UnprivilegedPipelineContent {
Ok(())
}
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android")))]
#[cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os = "android"), not(target_arch="arm")))]
pub fn spawn_multiprocess(self) -> Result<(), Error> {
use crate::sandboxing::content_process_sandbox_profile;
use gaol::sandbox::{self, Sandbox, SandboxMethods};