aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorVadim Malenboim <vadikml@gmail.com>2016-05-23 04:26:56 -0700
committerVadim Malenboim <vadikml@gmail.com>2016-05-24 02:08:35 -0700
commitacc37d5bb08a06d16eda9045cd2101ded3b71745 (patch)
treecaac363db68ba671eb35555e14ed90c098eee748 /tools
parentd87aca79b5ca67086a3cf63857961ddee44f27a3 (diff)
Changing android ndk directory existence test
Starting ndk 11 ndk_dir/RELEASE.TXT was removed. The new file to test is ndk_dir/source.properties according to a proposal at http://forum.kodi.tv/showthread.php?tid=274621&pid=2337598#pid2337598 for the ability to configure the build for both prior and post 11 ndk version, changing the test for any of the mentioned files above (“or” between both of them).
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index 7b25715940..b4319d727b 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -456,7 +456,7 @@ if test "$platform_os" == "android"; then
AC_MSG_ERROR("NDK path is required for android")
fi
- if ! test -f "$use_ndk/RELEASE.TXT" ; then
+ if ([! test -f "$use_ndk/source.properties"] && [! test -f "$use_ndk/RELEASE.TXT"]) ; then
AC_MSG_ERROR("$use_ndk is not an NDK directory")
fi