29 Commits

Author	SHA1	Message	Date
Marina Kolpakova	b28b2428f6	changing package layout after 'make install' for Android build	2012-06-28 17:23:50 +00:00
Marina Kolpakova	01570fa800	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
Andrey Kamaev	50ad690993	Merged the trunk till r8291	2012-05-18 12:18:17 +00:00
Andrey Pavlenko	a227746d84	removing extra quotes that causes build failure	2012-04-25 05:25:17 +00:00
Andrey Kamaev	bf8c4a27be	Android build scripts for Windows are updated to recognize ninja	2012-04-24 14:32:25 +00:00
Andrey Kamaev	228b87250a	Windows build scripts for Android are updated for SDK r14 and newer	2012-02-24 09:39:28 +00:00
Andrey Kamaev	23af203e00	Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts	2012-02-06 11:30:59 +00:00
Andrey Kamaev	eb1790e5f1	Fixed Android build on Windows.	2011-11-17 20:43:14 +00:00
Andrey Kamaev	3bdb53e484	Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support.	2011-11-16 14:32:10 +00:00
Andrey Kamaev	e8032fa8e9	Fixed Android build with SDK revision 14	2011-10-21 08:35:34 +00:00
Andrey Kamaev	d4c094745f	Android port is updated for NDK r6b	2011-09-02 11:13:32 +00:00
Andrey Kamaev	322b09fc12	Removed outdated stuff from Android build scripts	2011-07-25 13:42:23 +00:00
Andrey Kamaev	7c6fc6e18a	Android samples are renamed	2011-07-15 15:56:08 +00:00
Andrey Kamaev	39dab5e0cf	Headers are included into opencv_java build	2011-07-15 15:26:29 +00:00
Andrey Kamaev	85c8a69fdf	Fixed Android packaging script	2011-07-14 10:03:19 +00:00
Andrey Kamaev	20ec29f22e	Android samples are included into the Android package	2011-07-14 09:34:57 +00:00
Andrey Kamaev	6623fe3b08	Added option INSTALL_ANDROID_EXAMPLES (default off); Added option for choosing SDK platform for Android tests and samples.	2011-07-12 15:59:31 +00:00
Andrey Kamaev	7159845021	Added packaging script for Android	2011-07-12 12:59:26 +00:00
Andrey Kamaev	1c96aac52e	Fixed several cross-compiling issues. Fixed cmake status report.	2011-07-02 15:12:07 +00:00
Andrey Kamaev	f8e42721d3	HelloAndroid sample is moved to samples/android	2011-07-01 13:12:05 +00:00
Andrey Kamaev	092699783a	Added cmake script to build Android samples	2011-06-30 13:37:56 +00:00
Andrey Kamaev	092beae2d5	Updated NDK default paths for version r5c	2011-06-16 20:25:15 +00:00
Andrey Kamaev	c7bdf83de5	Fixed Android build	2011-06-03 12:01:55 +00:00
Andrey Kamaev	9d787afe72	Small Android build fixes	2011-05-13 18:32:05 +00:00
Andrey Kamaev	6facf8ba3b	Final version of scripts for Android cross-compilation on Windows.	2011-05-10 13:35:20 +00:00
Andrey Kamaev	4c7a8f8d24	Updated Android cross-compilation on Windows.	2011-05-09 23:22:46 +00:00
Andrey Kamaev	c67f1a2551	Added missed CMakeCache.android.initial.cmake to windows build scripts	2011-05-06 20:53:55 +00:00
Andrey Kamaev	43f12fa96b	Removed excess l	2011-05-06 18:42:25 +00:00
Andrey Kamaev	727fbd5376	Android cmake toolchain file is included into OpenCV	2011-05-03 08:13:50 +00:00