Allow for manual native code building

diff --git a/common.py b/common.py
index 48be88eba64201c7dd5404075e7049a0d132246b..9c5d5b76381ce8efcb392f95080df14482125621 100644 (file)
--- a/common.py
+++ b/common.py
@@ -954,7 +954,7 @@ def scan_source(build_dir, root_dir, thisbuild):
     # Presence of a jni directory without buildjni=yes might
     # indicate a problem...
     if (os.path.exists(os.path.join(root_dir, 'jni')) and 
-            thisbuild.get('buildjni', 'no') != 'yes'):
+            thisbuild.get('buildjni', 'no') == 'no'):
         msg = 'Found jni directory, but buildjni is not enabled'
         problems.append(msg)
 

diff --git a/docs/fdroid.html b/docs/fdroid.html
index 670722f57c73bc53cd7e96f6102892971312e4ca..bc6720054d326da6e998da0e2ef15b815825d95b 100644 (file)
--- a/docs/fdroid.html
+++ b/docs/fdroid.html
@@ -613,8 +613,14 @@ tools.
      <br><dt><code>initfun=yes</code><dd>Enables a selection of mad hacks to make com.funambol.android build. 
 Probably not useful for any other application.
 
-     <br><dt><code>buildjni=yes</code><dd>Enables building of native code via the ndk-build script before doing
-the main ant build.
+     <br><dt><code>buildjni=[no|yes|force]</code><dd>Enables building of native code via the ndk-build script before doing
+the main ant build. The default is <code>no</code>.
+
+     <p>The build and scan processes will complain (refuse to build) if this is set
+to <code>no</code>, but there is a <code>jni</code> directory present. If the native code
+is being built by other means, you can specify <code>manual</code> here to avoid
+that. However, if the native code is actually not required, remove the
+directory instead.
 
      <br><dt><code>submodules=yes</code><dd>Use if the project (git only) has submodules - causes git submodule
 init and update to be executed after the source is cloned.

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index a6643b367013c543f18799113b76bba0797a6a45..561a68661b8d7c65141748a0ba2db3c375b89d83 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -505,9 +505,15 @@ Be aware of any customisations in build.xml when using update=force.
 Enables a selection of mad hacks to make com.funambol.android build.
 Probably not useful for any other application.
 
-@item buildjni=yes
+@item buildjni=[no|yes|force]
 Enables building of native code via the ndk-build script before doing
-the main ant build.
+the main ant build. The default is @code{no}.
+
+The build and scan processes will complain (refuse to build) if this is set
+to @code{no}, but there is a @code{jni} directory present. If the native code
+is being built by other means, you can specify @code{manual} here to avoid
+that. However, if the native code is actually not required, remove the
+directory instead.
 
 @item submodules=yes
 Use if the project (git only) has submodules - causes git submodule