Bug 1318745 - Drop servo-freetype-sys dependency on Android. r=morris?
authorKartikaya Gupta <kgupta@mozilla.com>
Fri, 18 Nov 2016 15:18:04 -0500
changeset 459799 f203c19819d843971863774d08f90a06a5213163
parent 459798 7366f433e57d9b6fa35b2f4a0a59d22ee10e4ff6
child 459800 cdc06165e8cd75ea2f779e0197e55e40d04877e4
push id41343
push userkgupta@mozilla.com
push dateThu, 12 Jan 2017 20:13:44 +0000
reviewersmorris
bugs1318745
milestone53.0a1
Bug 1318745 - Drop servo-freetype-sys dependency on Android. r=morris? MozReview-Commit-ID: AGwSMwLClKj
README.webrender
gfx/webrender/Cargo.toml
--- a/README.webrender
+++ b/README.webrender
@@ -1,31 +1,27 @@
 Step 1: Install/switch to Rust Nightly
     If you don't have it installed, you can install it from https://www.rust-lang.org/en-US/downloads.html
     For Linux/Mac you can do this using rustup, see the curl command at the bottom of the page
     For Windows you can use the MSVC ABI Nightly installer linked to from that download page
     Note: do NOT install rust using ./mach bootstrap, as that will install the stable version and we need Nightly.
           If you have already installed stable rust, make sure it is not in your $PATH
 
-Step 2: Install cmake (required to build servo-freetype-sys)
-    For Linux/Mac use your package manager of choice (apt-get/brew/whatever)
-    For Windows download the installer from https://cmake.org/download/ (3.6.3 stable confirmed working)
-
-Step 3: Set up environment
+Step 2: Set up environment
     Add the following two lines to your mozconfig:
         ac_add_options --enable-rust
         ac_add_options --enable-webrender
-    Ensure rustc, cargo, and cmake are in your $PATH.
+    Ensure rustc and cargo are in your $PATH.
         On Windows in the MozillaBuild shell you can run:
-            export PATH="$PATH:/c/Program Files/Rust nightly MSVC 1.14/bin:/c/Program Files/CMake/bin"
+            export PATH="$PATH:/c/Program Files/Rust nightly MSVC 1.14/bin"
         to add them to your path assuming you used the default installation options when installing.
         You can also add the export statement to your mozconfig
     The first time you do a build with these changes, you should also run |mach clobber|
 
-Step 4:
+Step 3:
     Build using |mach build|
 
 
 When making changes:
     - Make the changes you want.
     - Run |mach build| or |mach build binaries| as desired.
 
 
--- a/gfx/webrender/Cargo.toml
+++ b/gfx/webrender/Cargo.toml
@@ -23,20 +23,17 @@ lazy_static = "0.2"
 log = "0.3"
 num-traits = "0.1.32"
 offscreen_gl_context = {version = "0.5", features = ["serde_serialization", "osmesa"]}
 rayon = "0.5"
 time = "0.1"
 webrender_traits = {path = "../webrender_traits", default-features = false}
 bitflags = "0.7"
 
-[target.'cfg(target_os = "android")'.dependencies]
-freetype = "0.1.2"
-
-[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
+[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
 freetype = {version = "0.1.2", default-features = false}
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = "0.1.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-graphics = "0.4.1"
 core-text = "2.0"