auto merge of #3985 : mbrubeck/servo/android-green, r=larsbergstrom

r? @glennw

4 files changed, 70 insertions, 43 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 2f9a83d51b2..77d5df3e827 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,11 +5,11 @@ dependencies = [
  "compositing 0.0.1",
  "gfx 0.0.1",
  "glfw_app 0.0.1",
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "layout 0.0.1",
  "msg 0.0.1",
  "net 0.0.1",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "script 0.0.1",
  "url 0.1.0 (git+https://github.com/servo/rust-url)",
  "util 0.0.1",
@@ -295,7 +295,7 @@ dependencies = [
 [[package]]
 name = "green"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "harfbuzz"
@@ -322,7 +322,7 @@ source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463
 [[package]]
 name = "http"
 version = "0.1.0-pre"
-source = "git+https://github.com/servo/rust-http?ref=servo#3597f981aa001c57d3c918eb9f8ab58d3f0bf5a5"
+source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256"
 dependencies = [
  "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)",
  "url 0.1.0 (git+https://github.com/servo/rust-url)",
@@ -342,11 +342,11 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#b8109aa873d886b6ee295ea17359063da7fd3e2f"
+source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -357,7 +357,7 @@ source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#36bcefcdc791bd6fa4ab389f472e449ce2e1e159"
+source = "git+https://github.com/servo/rust-layers#84f6dd677aa681b03cfcbf89000d2c7b12684bd3"
 dependencies = [
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
@@ -481,10 +481,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
 [[package]]
 name = "rustuv"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
- "tls 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
+ "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -585,7 +585,7 @@ version = "0.0.1"
 [[package]]
 name = "tls"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "url"
diff --git a/Cargo.toml b/Cargo.toml
index 64558757e2a..efc9d869c4d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,9 @@ optional = true
 git = "https://github.com/servo/rust-url"
 
 [dependencies.green]
-git = "https://github.com/alexcrichton/green-rs"
+git = "https://github.com/servo/green-rs"
+branch = "servo"
 
 [dependencies.rustuv]
-git = "https://github.com/alexcrichton/green-rs"
+git = "https://github.com/servo/green-rs"
+branch = "servo"
diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock
index cfc3f376ff0..9a16a43736f 100644
--- a/ports/android/glut_app/Cargo.lock
+++ b/ports/android/glut_app/Cargo.lock
@@ -257,7 +257,7 @@ dependencies = [
 [[package]]
 name = "glut"
 version = "0.0.1"
-source = "git+https://github.com/servo/rust-glut#01af0162ea0322ad1a40d6adb023a39813605949"
+source = "git+https://github.com/servo/rust-glut#63aa09161b6b2a8c5daac91449d1fc3b0c3e665f"
 dependencies = [
  "opengles 0.1.0 (git+https://github.com/servo/rust-opengles)",
 ]
@@ -273,7 +273,7 @@ dependencies = [
 [[package]]
 name = "green"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "harfbuzz"
@@ -300,7 +300,7 @@ source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463
 [[package]]
 name = "http"
 version = "0.1.0-pre"
-source = "git+https://github.com/servo/rust-http?ref=servo#3597f981aa001c57d3c918eb9f8ab58d3f0bf5a5"
+source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256"
 dependencies = [
  "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)",
  "url 0.1.0 (git+https://github.com/servo/rust-url)",
@@ -320,11 +320,11 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#b8109aa873d886b6ee295ea17359063da7fd3e2f"
+source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -335,7 +335,7 @@ source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#36bcefcdc791bd6fa4ab389f472e449ce2e1e159"
+source = "git+https://github.com/servo/rust-layers#84f6dd677aa681b03cfcbf89000d2c7b12684bd3"
 dependencies = [
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
@@ -464,10 +464,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
 [[package]]
 name = "rustuv"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
- "tls 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
+ "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -513,11 +513,11 @@ version = "0.0.1"
 dependencies = [
  "compositing 0.0.1",
  "gfx 0.0.1",
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "layout 0.0.1",
  "msg 0.0.1",
  "net 0.0.1",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "script 0.0.1",
  "url 0.1.0 (git+https://github.com/servo/rust-url)",
  "util 0.0.1",
@@ -579,7 +579,7 @@ version = "0.0.1"
 [[package]]
 name = "tls"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "url"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 2f9a83d51b2..1313b8021a9 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1,17 +1,25 @@
 [root]
-name = "servo"
+name = "embedding"
 version = "0.0.1"
 dependencies = [
- "compositing 0.0.1",
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
+ "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
+ "core_text 0.1.0 (git+https://github.com/servo/rust-core-text)",
+ "devtools 0.0.1",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gfx 0.0.1",
+ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo)",
  "glfw_app 0.0.1",
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
- "layout 0.0.1",
+ "js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
+ "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "msg 0.0.1",
  "net 0.0.1",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "plugins 0.0.1",
+ "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "script 0.0.1",
- "url 0.1.0 (git+https://github.com/servo/rust-url)",
+ "servo 0.0.1",
+ "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
+ "style 0.0.1",
  "util 0.0.1",
 ]
 
@@ -295,7 +303,7 @@ dependencies = [
 [[package]]
 name = "green"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "harfbuzz"
@@ -322,7 +330,7 @@ source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463
 [[package]]
 name = "http"
 version = "0.1.0-pre"
-source = "git+https://github.com/servo/rust-http?ref=servo#3597f981aa001c57d3c918eb9f8ab58d3f0bf5a5"
+source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256"
 dependencies = [
  "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)",
  "url 0.1.0 (git+https://github.com/servo/rust-url)",
@@ -342,11 +350,11 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-mozjs#b8109aa873d886b6ee295ea17359063da7fd3e2f"
+source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
  "mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
- "rustuv 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -357,7 +365,7 @@ source = "git+https://github.com/bjz/gl-rs.git#79cd3b3f9f19aa0e39f6af572fc8673a6
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#36bcefcdc791bd6fa4ab389f472e449ce2e1e159"
+source = "git+https://github.com/servo/rust-layers#84f6dd677aa681b03cfcbf89000d2c7b12684bd3"
 dependencies = [
  "cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
  "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)",
@@ -481,10 +489,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
 [[package]]
 name = "rustuv"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 dependencies = [
- "green 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
- "tls 0.0.1 (git+https://github.com/alexcrichton/green-rs)",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
+ "tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
 ]
 
 [[package]]
@@ -530,6 +538,23 @@ version = "0.1.0"
 source = "git+https://github.com/rust-lang/semver#7dca047a9cd40e929a4545b37a1917daff82f156"
 
 [[package]]
+name = "servo"
+version = "0.0.1"
+dependencies = [
+ "compositing 0.0.1",
+ "gfx 0.0.1",
+ "glfw_app 0.0.1",
+ "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
+ "layout 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
+ "script 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url)",
+ "util 0.0.1",
+]
+
+[[package]]
 name = "skia-sys"
 version = "0.0.20130412"
 source = "git+https://github.com/servo/skia#d92603043a9b7dd0b25c0b3b562099a0cc32ac6c"
@@ -585,7 +610,7 @@ version = "0.0.1"
 [[package]]
 name = "tls"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/green-rs#215f3c87bf545b36a90100b7fb209ba640f2f481"
+source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf"
 
 [[package]]
 name = "url"