Skip to content

Commit 95e4c5a

Browse files
committed
Show actual values found from environment in info messages.
1 parent 09ee2db commit 95e4c5a

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

pythonforandroid/build.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,12 @@ def prepare_build_environment(self,
231231
android_api = None
232232
if user_android_api:
233233
android_api = user_android_api
234-
info('Getting Android API version from user argument')
234+
info('Getting Android API version from user argument:'
235+
' it is {}'.format(android_api))
235236
elif 'ANDROIDAPI' in environ:
236237
android_api = environ['ANDROIDAPI']
237-
info('Found Android API target in $ANDROIDAPI')
238+
info('Found Android API target in $ANDROIDAPI:'
239+
' it is {}'.format(android_api))
238240
else:
239241
info('Android API target was not set manually, using '
240242
'the default of {}'.format(DEFAULT_ANDROID_API))
@@ -282,15 +284,18 @@ def prepare_build_environment(self,
282284
if ndk_dir is None: # The old P4A-specific dir
283285
ndk_dir = environ.get('ANDROIDNDK', None)
284286
if ndk_dir is not None:
285-
info('Found NDK dir in $ANDROIDNDK')
287+
info('Found NDK dir in $ANDROIDNDK:'
288+
' it is {}'.format(ndk_dir))
286289
if ndk_dir is None: # Apparently the most common convention
287290
ndk_dir = environ.get('NDK_HOME', None)
288291
if ndk_dir is not None:
289-
info('Found NDK dir in $NDK_HOME')
292+
info('Found NDK dir in $NDK_HOME:'
293+
' it is {}'.format(ndk_dir))
290294
if ndk_dir is None: # Another convention (with maven?)
291295
ndk_dir = environ.get('ANDROID_NDK_HOME', None)
292296
if ndk_dir is not None:
293-
info('Found NDK dir in $ANDROID_NDK_HOME')
297+
info('Found NDK dir in $ANDROID_NDK_HOME:'
298+
' it is {}'.format(ndk_dir))
294299
if ndk_dir is None: # Checks in the buildozer NDK dir, useful
295300
# # for debug tests of p4a
296301
possible_dirs = glob.glob(expanduser(join(
@@ -314,11 +319,13 @@ def prepare_build_environment(self,
314319
if user_ndk_ver:
315320
ndk_ver = user_ndk_ver
316321
if ndk_dir is not None:
317-
info('Got NDK version from from user argument')
322+
info('Got NDK version from from user argument:'
323+
' it is {}'.format(ndk_ver))
318324
if ndk_ver is None:
319325
ndk_ver = environ.get('ANDROIDNDKVER', None)
320326
if ndk_dir is not None:
321-
info('Got NDK version from $ANDROIDNDKVER')
327+
info('Got NDK version from $ANDROIDNDKVER:'
328+
' it is {}'.format(ndk_ver))
322329

323330
self.ndk = 'google'
324331

0 commit comments

Comments
 (0)