GetDevices: Also allow `\.` to be part of the host name

[platform/upstream/VK-GL-CTS.git] / android / scripts / common.py

diff --git a/android/scripts/common.py b/android/scripts/common.py
index dfc3a8b..13fb1fd 100644 (file)
--- a/android/scripts/common.py
+++ b/android/scripts/common.py
@@ -121,7 +121,7 @@ def execArgsInDirectory (args, cwd, linePrefix=""):
 
        process = subprocess.Popen(args, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        stdoutJob = threading.Thread(target=readApplyPrefixAndPrint, args=(process.stdout, linePrefix, sys.stdout))
-       stderrJob = threading.Thread(target=readApplyPrefixAndPrint, args=(process.stdout, linePrefix, sys.stderr))
+       stderrJob = threading.Thread(target=readApplyPrefixAndPrint, args=(process.stderr, linePrefix, sys.stderr))
        stdoutJob.start()
        stderrJob.start()
        retcode = process.wait()
@@ -211,9 +211,9 @@ def getExtraBuildArgs (generator):
 
 NDK_HOST_OS_NAMES = [
        "windows",
-       "windows_x86-64",
+       "windows-x86_64",
        "darwin-x86",
-       "darwin-x86-64",
+       "darwin-x86_64",
        "linux-x86",
        "linux-x86_64"
 ]
@@ -236,13 +236,13 @@ NATIVE_LIBS                               = [
                NativeLib(21,           "arm64-v8a",    'android-arm64'),       # ARM64 v8a ABI
        ]
 
-ANDROID_JAVA_API               = "android-13"
+ANDROID_JAVA_API               = "android-22"
 NATIVE_LIB_NAME                        = "libdeqp.so"
 
 def selectNDKPath ():
        candidates =  [
-               os.path.expanduser("~/android-ndk-r10c"),
-               "C:/android/android-ndk-r10c",
+               os.path.expanduser("~/android-ndk-r11"),
+               "C:/android/android-ndk-r11",
                os.environ.get("ANDROID_NDK_PATH", None), # If not defined, return None
        ]
 
@@ -262,7 +262,7 @@ def noneSafePathJoin (*components):
 # 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
+ANDROID_NDK_TOOLCHAIN_VERSION  = "r11" # Toolchain file is selected based on this
 
 # Native code build settings
 CMAKE_GENERATOR                        = selectByOS({
@@ -273,6 +273,7 @@ EXTRA_BUILD_ARGS            = getExtraBuildArgs(CMAKE_GENERATOR)
 
 # SDK paths
 ANDROID_SDK_PATH               = selectFirstExistingDir([
+               os.environ.get("ANDROID_SDK_PATH", None),
                os.path.expanduser("~/android-sdk-linux"),
                os.path.expanduser("~/android-sdk-mac_x86"),
                "C:/android/android-sdk-windows",