Switch android build to use NDK-provided cmake file

* The existing android cmake file doesn't work with newer NDK releases, so we
  have to use the provided cmake file. It should work in NDKs as far back as
  version 14.
This commit is contained in:
baldurk
2018-09-25 15:09:54 +01:00
parent 0092e5ced2
commit 5b07a48479
5 changed files with 72 additions and 1727 deletions
+11 -1
View File
@@ -186,4 +186,14 @@ enum
// this strips them completely
#define STRIP_DEBUG_LOGS OPTION_OFF
#define ENABLE_UNIT_TESTS RDOC_DEVEL
// disable unit tests on android
#if ENABLED(RDOC_ANDROID)
#define ENABLE_UNIT_TESTS OPTION_OFF
#else
// otherwise, enable them in development builds
#define ENABLE_UNIT_TESTS RDOC_DEVEL
#endif