From: Piotr Byszewski <piotr.byszewski@mobica.com>
Date: Mon, 23 Jan 2023 11:50:36 +0000 (+0100)
Subject: Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5
X-Git-Tag: upstream/1.3.5~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=974e8f9949d3498fabe216748bd9766930a0e7c6;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

Change-Id: I04c012af54c82eb4eba8661f5bbc56eca50f5010
---

974e8f9949d3498fabe216748bd9766930a0e7c6
diff --cc scripts/android/build_apk.py
index ef7d6ae,b39d4b7..724453d
--- a/scripts/android/build_apk.py
+++ b/scripts/android/build_apk.py
@@@ -39,14 -39,14 +39,14 @@@ import xml.etree.ElementTre
  # Import from <root>/scripts
  sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
  
 -from build.common import *
 -from build.config import *
 -from build.build import *
 +from ctsbuild.common import *
 +from ctsbuild.config import *
 +from ctsbuild.build import *
  
  class SDKEnv:
- 	def __init__(self, path):
+ 	def __init__(self, path, desired_version):
  		self.path				= path
- 		self.buildToolsVersion	= SDKEnv.selectBuildToolsVersion(self.path)
+ 		self.buildToolsVersion	= SDKEnv.selectBuildToolsVersion(self.path, desired_version)
  
  	@staticmethod
  	def getBuildToolsVersions (path):