3 Commits

Author	SHA1	Message	Date
Manish Goregaokar	30776951fa	servo: Merge #4570 - Fix Android warnings (from Manishearth:android-warn); r=jdm ... My local android build is a bit wonky so I'm not sure if all warnings have been fixed, though. I'll try to poke around and fix it. Source-Repo: https://github.com/servo/servo Source-Revision: d9751c0fbb13d04b27c42a9ba5065b5af26f1286	2015-01-08 21:54:48 -07:00
Glenn Watson	81653d18b6	servo: Merge #4581 - Update android openssl version due to security advisory https://www.openssl.org/news/secadv_20150108.txt (from glennw:openssl-update); r=larsbergstrom ... Source-Repo: https://github.com/servo/servo Source-Revision: 78798026ac245187f92d7d3f88f7fe012c63ff9d	2015-01-08 17:15:50 -07:00
Glenn Watson	4e87a2eaa4	servo: Merge #4292 - Use mach to build openssl on android instead of glut makefile (from glennw:android-ssl); r=mbrubeck ... The glut makefile will be removed shortly after glutin lands for android, so we need to build openssl for android elsewhere in the build process. Source-Repo: https://github.com/servo/servo Source-Revision: 2741fd2e139b9cb8e9f14857877f567ecae3bced	2014-12-08 17:54:57 -07:00