83 commits

Author	SHA1	Message	Date
SamGondelman	07600f2a81	add etc2comp dependency on desktop and android	2018-05-08 17:30:48 -07:00
Gabriel Calero	25f207a6db	Add hifi audio codec in Android build	2018-03-12 18:29:57 -03:00
Brad Davis	18f2387fa1	Fix windows/android Qt build	2018-02-12 11:20:43 -08:00
Bradley Austin Davis	97c878e4fe	Fix Windows android build	2018-02-09 15:06:09 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	6b8bfdb750	Use version IDs in scribe tool downloads	2018-02-06 17:35:00 -08:00
Brad Davis	d087530423	Add nvtt to android build	2018-02-02 13:42:26 -08:00
Brad Davis	ca83999546	Trying to fix Android pre-build	2018-01-16 09:22:39 -08:00
Brad Davis	673a396fdc	Extend timeout for capturing executable output	2018-01-16 09:11:50 -08:00
Brad Davis	55bfdc105b	Switch android to GLAD	2018-01-14 10:22:18 -08:00
Brad Davis	4dfe0073bc	Do asset merging post-build	2018-01-10 17:18:30 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Gabriel Calero	6d732dd8ba	Add missing Qt dependencies to gradle script	2018-01-05 19:45:02 -03:00
Gabriel Calero	8cac98545a	Fixes for Android	2018-01-04 17:36:10 -03:00
Cristian Luis Duarte	da28e0a8cb	Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup	2018-01-03 16:42:18 -03:00
Gabriel Calero	ef8ba1cad0	Include config.h in ResourceImageItem.cpp. Minor fixes	2018-01-03 16:40:14 -03:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
Brad Davis	6cf99e0b03	Add version IDs to dependency downloads	2017-12-16 16:17:31 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Bradley Austin Davis	a776c415eb	Fix gradle dependencies	2017-12-11 13:35:56 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Brad Davis	0379ebad63	Updating android toolchain for QML	2017-12-07 11:19:31 -08:00
Bradley Austin Davis	300e1835eb	Fix scribe permissions setting	2017-11-28 12:20:52 -08:00
Brad Davis	251ae81536	Adding verification to downloaded files for android	2017-11-28 11:32:41 -08:00
Brad Davis	8d6d1f67f1	Support RELEASE_TYPE and RELEASE_NUM for Android	2017-11-28 11:32:36 -08:00
Bradley Austin Davis	9293391297	Reduce number of gradle files	2017-11-28 11:32:35 -08:00
Bradley Austin Davis	ddc2548c53	Add polyvox, fix task copy bugs	2017-11-28 11:32:34 -08:00
Bradley Austin Davis	d6072f2bf2	Add bullet and draco to precompiled libraries	2017-11-28 11:32:34 -08:00
Brad Davis	d769acd345	Updating Android toolchain	2017-11-28 11:32:32 -08:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00