Auto merge of #6740 - mbrubeck:bitflags, r=larsbergstrom

Upgrade openssl, selectors, and cocoa This lets Servo use one version of bitflags for all dependencies. r? @larsbergstrom or @Ms2ger  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6740)
servo · Jul 30, 2015 · df722ec · df722ec
2 parents 4837dd9 + 63d39a4
commit df722ec
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 50 deletions.
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/gonk/.cargo/config b/ports/gonk/.cargo/config
@@ -1,6 +1,3 @@
 [target.arm-linux-androideabi]
 ar = "arm-linux-androideabi-ar"
 linker = "./fake-ld.sh"
-
-[target.arm-linux-androideabi.openssl]
-rustc-flags = "-l crypto -l ssl"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -285,7 +285,7 @@ def build_env(self, gonk=False, hosts_file_path=None):
                 "%(gonkdir)s/out/target/product/%(gonkproduct)s/obj/lib"
             ) % {"gonkdir": env["GONKDIR"], "gonkproduct": env["GONK_PRODUCT"]}
             env["OPENSSL_LIB_DIR"] = openssl_dir
-            env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
+            env['OPENSSL_INCLUDE_DIR'] = path.join(env["GONKDIR"], "external/openssl/include")
 
         # FIXME: These are set because they are the variable names that
         # android-rs-glue expects. However, other submodules have makefiles that