Commit Graph

15 Commits

Author SHA1 Message Date
Brad Leege
eadb3646d5 #826 - Updating copy destinations 2015-02-10 12:42:14 -08:00
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Leith Bade
1daf2207aa Remove coffeecatch 2015-01-13 20:31:24 +11:00
Leith Bade
b3a0a205df Fix jpeg android gyp 2014-11-28 00:15:05 +11:00
Leith Bade
f0e4e27cd3 Read styles from APK 2014-11-17 23:17:22 +11:00
Leith Bade
97dc28883e Add coffeecatch 2014-11-16 19:32:51 +11:00
Leith Bade
6b9e3c60ef Renamed source files using mapbox style
Move headers to mbgl/android
Tidy up headers and includes
2014-11-12 21:17:24 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Justin R. Miller
ee482fbf6e fix styles path 2014-11-07 16:28:19 -08:00
Leith Bade
0ac4247f72 Temp disable SSL cert validation 2014-11-08 08:44:39 +11:00
Leith Bade
c0c6d9d78e Link all libs statically 2014-11-06 18:56:33 +11:00
Leith Bade
0da778d244 Move cpp files into dir 2014-11-06 00:02:17 +11:00
Leith Bade
9476b7a66f Add JNI code to build system 2014-11-05 22:53:48 +11:00