Default to CPU renering on Android to avoid GPU-rendering-specific driver woes

1 files changed, 10 insertions, 1 deletions

diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index 562cd71ce28..4ad5e04c14c 100755
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -143,7 +143,16 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
                 args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));
             }
         }
-        opts::from_cmdline_args(args).map(run);
+
+        let mut opts = opts::from_cmdline_args(args);
+        match opts {
+            Some(mut o) => {
+                // Always use CPU rendering on android.
+                o.cpu_painting = true;
+                run(o);
+            },
+            None => {}
+        }
     })
 }