fixed detection of GCC from Android NDK >= 18b (+windows)

Author: gfursin

CHANGES

@@ -1,4 +1,5 @@
 * 2018.12.15 - [FGG] fixed registration of Clang from Android NDK >= 17 with LLVM C++ lib
+                     fixed detection of GCC from Android NDK >= 18b (+windows)
 
 * 2018.12.11 - [FGG] fixed ck snapshot artifact (with Leo's feedback)
 

module/soft/module.py

@@ -2203,6 +2203,7 @@ def get_version(i):
        # Calling customized script to parse version
        ii={'output':lst,
            'host_os_dict':hosd,
+           'full_path':fp,
            'ck_kernel':ck}
        rx=cs.parse_version(ii)
        if rx['return']>0 and rx['return']!=16: return rx

soft/compiler.gcc.android.ndk/customize.py

@@ -58,7 +58,9 @@ def limit(i):
        return {'return':1, 'error':'android_compiler_prefix is not specified in target OS meta'}
 
     fn=acp+'-gcc'
+    fn1=''
     if phosd=='win':
+       fn1=fn+'.cmd' # After NDK 18b, no more gcc
        fn+='.exe'
 
     atc=tosd.get('android_toolchain','')
@@ -83,6 +85,10 @@ def limit(i):
                   p2=os.path.join(p1,f,'prebuilt',prebuilt,'bin',fn)
                   if os.path.isfile(p2):
                      drx.append(p2)
+                  elif fn1!='':
+                     p2=os.path.join(p1,f,'prebuilt',prebuilt,'bin',fn1)
+                     if os.path.isfile(p2):
+                        drx.append(p2)
 
     return {'return':0, 'list':drx}
 
@@ -95,6 +101,8 @@ def parse_version(i):
 
     ver=''
 
+    fp=i.get('full_path','')
+
     for q in lst:
         q=q.strip()
         if q!='':
@@ -107,6 +115,9 @@ def parse_version(i):
               ver=q
               break
 
+    if ver=='' and fp.endswith('.cmd'):
+       ver='unused'
+
     return {'return':0, 'version':ver}
 
 ##############################################################################