Disable gaol on arm targets

servo · Dec 20, 2018 · 1d0af2d · 1d0af2d
1 parent 16beb65
commit 1d0af2d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
@@ -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"}
diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs
@@ -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;
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
@@ -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};

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -71,5 +71,5 @@ webdriver_server = {path = "../webdriver_server", optional = true}
 webvr = {path = "../webvr"}
 webvr_traits = {path = "../webvr_traits"}
 
-[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"}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
@@ -68,14 +68,14 @@ use canvas::webgl_thread::WebGLThreads;
 use compositing::compositor_thread::{CompositorProxy, CompositorReceiver, InitialCompositorState};
 use compositing::windowing::{WindowEvent, WindowMethods};
 use compositing::{IOCompositor, RenderNotifier, ShutdownState};
-#[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")))]
 use constellation::content_process_sandbox_profile;
 use constellation::{Constellation, InitialConstellationState, UnprivilegedPipelineContent};
 use constellation::{FromCompositorLogger, FromScriptLogger};
 use crossbeam_channel::{unbounded, Sender};
 use embedder_traits::{EmbedderMsg, EmbedderProxy, EmbedderReceiver, EventLoopWaker};
 use env_logger::Builder as EnvLoggerBuilder;
-#[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")))]
 use gaol::sandbox::{ChildSandbox, ChildSandboxMethods};
 use gfx::font_cache_thread::FontCacheThread;
 use ipc_channel::ipc::{self, IpcSender};
@@ -661,14 +661,14 @@ pub fn run_content_process(token: String) {
                                      );
 }
 
-#[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")))]
 fn create_sandbox() {
     ChildSandbox::new(content_process_sandbox_profile())
         .activate()
         .expect("Failed to activate sandbox!");
 }
 
-#[cfg(any(target_os = "windows", target_os = "ios", target_os = "android"))]
+#[cfg(any(target_os = "windows", target_os = "ios", target_os = "android", target_arch="arm"))]
 fn create_sandbox() {
-    panic!("Sandboxing is not supported on Windows, iOS and android.");
+    panic!("Sandboxing is not supported on Windows, iOS, ARM targets and android.");
 }