Use env variable ANDROID_NDK_PATH as 3rd option for NDK dir.

Also added some additional user info for debugging issues.

Change-Id: I6d82538453879877b51be2d852044b9ce9d49eee

diff --git a/android/scripts/build.py b/android/scripts/build.py
index 8f1cc2d..15a3170 100644 (file)
--- a/android/scripts/build.py
+++ b/android/scripts/build.py
@@ -173,12 +173,22 @@ def build (buildRoot=common.ANDROID_DIR, isRelease=False, nativeBuildType="Relea
                # Restore working dir
                os.chdir(curDir)
 
+def dumpConfig ():
+       print " "
+       for entry in common.CONFIG_STRINGS:
+               print "%-30s : %s" % (entry[0], entry[1])
+       print " "
+
 if __name__ == "__main__":
        parser = argparse.ArgumentParser()
        parser.add_argument('--is-release', dest='isRelease', type=bool, default=False, help="Build android project in release mode.")
        parser.add_argument('--native-build-type', dest='nativeBuildType', default="Release", help="Build type passed cmake when building native code.")
        parser.add_argument('--build-root', dest='buildRoot', default=common.ANDROID_DIR, help="Root directory for storing build results.")
+       parser.add_argument('--dump-config', dest='dumpConfig', action='store_true', help="Print out all configurations variables")
 
        args = parser.parse_args()
 
+       if args.dumpConfig:
+               dumpConfig()
+
        build(buildRoot=os.path.abspath(args.buildRoot), isRelease=args.isRelease, nativeBuildType=args.nativeBuildType)

diff --git a/android/scripts/common.py b/android/scripts/common.py
index fd3d8a9..f7d1c08 100644 (file)
--- a/android/scripts/common.py
+++ b/android/scripts/common.py
@@ -6,12 +6,20 @@ import sys
 import shlex
 import subprocess
 import multiprocessing
+import string
 
 class NativeLib:
        def __init__ (self, apiVersion, abiVersion):
                self.apiVersion = apiVersion
                self.abiVersion = abiVersion
 
+       def __str__ (self):
+               return "(API: %s, ABI: %s)" % (self.apiVersion, self.abiVersion)
+
+       def __repr__ (self):
+               return "(API: %s, ABI: %s)" % (self.apiVersion, self.abiVersion)
+
+
 def getPlatform ():
        if sys.platform.startswith('linux'):
                return 'linux'
@@ -70,9 +78,11 @@ def execute (commandLine):
                raise Exception("Failed to execute '%s', got %d" % (commandLine, retcode))
 
 def execArgs (args):
+       # Make sure previous stdout prints have been written out.
+       sys.stdout.flush()
        retcode = subprocess.call(args)
        if retcode != 0:
-               raise Exception("Failed to execute '%s', got %d" % (str(args), retcode))
+               raise Exception("Failed to execute '%s', got %d" % (str(args), retcode))
 
 class Device:
        def __init__(self, serial, product, model, device):
@@ -156,11 +166,22 @@ NATIVE_LIBS                               = [
 ANDROID_JAVA_API               = "android-13"
 NATIVE_LIB_NAME                        = "libdeqp.so"
 
-# NDK paths
-ANDROID_NDK_PATH               = selectFirstExistingDir([
+def selectNDKPath ():
+       candidates =  [
                os.path.expanduser("~/android-ndk-r10c"),
                "C:/android/android-ndk-r10c",
-       ])
+               os.path.normpath(os.environ["ANDROID_NDK_PATH"]),
+       ]
+
+       ndkPath = selectFirstExistingDir(candidates)
+
+       if ndkPath == None:
+               raise Exception("None of NDK directory candidates exist: %s. Check ANDROID_NDK_PATH in common.py" % candidates)
+
+       return ndkPath
+
+# NDK paths
+ANDROID_NDK_PATH                               = selectNDKPath()
 ANDROID_NDK_HOST_OS                            = getNDKHostOsName(ANDROID_NDK_PATH)
 ANDROID_NDK_TOOLCHAIN_VERSION  = "r10c" # Toolchain file is selected based on this
 
@@ -202,3 +223,24 @@ ANT_BIN                                    = selectFirstExistingBinary([
                "C:/android/apache-ant-1.9.3/bin/ant.bat",
                "C:/android/apache-ant-1.9.4/bin/ant.bat",
        ])
+
+def makeNameValueTuple (name):
+       return (name, str(eval(name)))
+
+CONFIG_STRINGS = [
+               makeNameValueTuple("ANDROID_DIR"),
+               makeNameValueTuple("NATIVE_LIBS"),
+               makeNameValueTuple("ANDROID_JAVA_API"),
+               makeNameValueTuple("NATIVE_LIB_NAME"),
+               makeNameValueTuple("ANDROID_NDK_PATH"),
+               makeNameValueTuple("ANDROID_NDK_HOST_OS"),
+               makeNameValueTuple("ANDROID_NDK_TOOLCHAIN_VERSION"),
+               makeNameValueTuple("CMAKE_GENERATOR"),
+               makeNameValueTuple("EXTRA_BUILD_ARGS"),
+               makeNameValueTuple("ANDROID_SDK_PATH"),
+               makeNameValueTuple("ANDROID_BIN"),
+               makeNameValueTuple("ADB_BIN"),
+               makeNameValueTuple("ZIPALIGN_BIN"),
+               makeNameValueTuple("JARSIGNER_BIN"),
+               makeNameValueTuple("ANT_BIN"),
+       ]