Improved handling of --android-api and --ndk-api

inclement · inclement · commit 54c5b3811080 · 2018-11-08T22:30:17.000Z
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -280,8 +280,7 @@ def prepare_build_environment(self,
         ndk_dir = None
         if user_ndk_dir:
             ndk_dir = user_ndk_dir
-            if ndk_dir is not None:
-                info('Getting NDK dir from from user argument')
+            info('Getting NDK dir from from user argument')
         if ndk_dir is None:  # The old P4A-specific dir
             ndk_dir = environ.get('ANDROIDNDK', None)
             if ndk_dir is not None:
@@ -357,8 +356,7 @@ def prepare_build_environment(self,
         ndk_api = None
         if user_ndk_api:
             ndk_api = user_ndk_api
-            if ndk_api is not None:
-                info('Getting NDK API version (i.e. minimum supported API) from user argument')
+            info('Getting NDK API version (i.e. minimum supported API) from user argument')
         if ndk_api is None:
             ndk_api = environ.get('NDKAPI', None)
             if ndk_api is not None:
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -8,6 +8,7 @@
 
 from __future__ import print_function
 from pythonforandroid import __version__
+from pythonforandroid.build import DEFAULT_NDK_API, DEFAULT_ANDROID_API
 
 
 def check_python_dependencies():
@@ -252,16 +253,22 @@ def __init__(self):
             '--ndk-dir', '--ndk_dir', dest='ndk_dir', default='',
             help='The filepath where the Android NDK is installed')
         generic_parser.add_argument(
-            '--android-api', '--android_api', dest='android_api', default=0,
-            type=int, help='The Android API level to build against.')
+            '--android-api',
+            '--android_api',
+            dest='android_api',
+            default=0,
+            type=int,
+            help=('The Android API level to build against defaults to {} if '
+                  'not specified.').format(DEFAULT_ANDROID_API))
         generic_parser.add_argument(
             '--ndk-version', '--ndk_version', dest='ndk_version', default='',
             help=('The version of the Android NDK. This is optional: '
                   'we try to work it out automatically from the ndk_dir.'))
         generic_parser.add_argument(
             '--ndk-api', type=int, default=0,
             help=('The Android API level to compile against. This should be your '
-                  '*minimal supported* API, not normally the same as your --android-api.'))
+                  '*minimal supported* API, not normally the same as your --android-api. '
+                  'Defaults to min(ANDROID_API, {}) if not specified.').format(DEFAULT_NDK_API))
         generic_parser.add_argument(
             '--symlink-java-src', '--symlink_java_src',
             action='store_true',
