From 68ab1ab4b1ad6c3768000efcc3bf699a9f781846 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 24 Jun 2016 16:07:30 +0200
Subject: [PATCH] Fix NDK version detection for NDK 12.

---
 prepare.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index f90dc1416..59200b4c4 100755
--- a/prepare.py
+++ b/prepare.py
@@ -138,8 +138,8 @@ class AndroidPreparator(prepare.Preparator):
                     python_config_files.append(os.path.join(root, filename))
             if len(python_config_files) > 0:
                 version = open(python_config_files[0]).readlines()[0]
-                res = re.match('^.*/aosp-ndk-r(\d+).*$', version)
-                version = int(res.group(1))
+                res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version)
+                version = int(res.group(2))
                 retval = False
             else:
                 error("Could not get Android NDK version!")