Merge "Revert "Convert external/deqp/android/cts to Android.bp""
diff --git a/android/cts/master/src/vk-test-issues.txt b/android/cts/master/src/vk-test-issues.txt
index 1f2bff2..ef1f4a7 100644
--- a/android/cts/master/src/vk-test-issues.txt
+++ b/android/cts/master/src/vk-test-issues.txt
@@ -25,3 +25,6 @@
# Issue 702: Tests use invalid conversion operations
dEQP-VK.spirv_assembly.instruction.*.indexing.*u32*
dEQP-VK.spirv_assembly.instruction.*.indexing.*s32*
+
+# b/112540895: Compile time is still unreasonable on low-end parts, revisit for Q
+dEQP-VK.ubo.random.all_shared_buffer.48
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 66fde77..7bf5d20 100755
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -202622,7 +202622,6 @@
dEQP-VK.ubo.random.all_shared_buffer.45
dEQP-VK.ubo.random.all_shared_buffer.46
dEQP-VK.ubo.random.all_shared_buffer.47
-dEQP-VK.ubo.random.all_shared_buffer.48
dEQP-VK.ubo.random.all_shared_buffer.49
dEQP-VK.ubo.random.all_out_of_order_offsets.0
dEQP-VK.ubo.random.all_out_of_order_offsets.1
diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
index f1fb2d5..d175c0c 100644
--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
@@ -98,7 +98,10 @@
{
return m_driver;
}
-
+ const tcu::FunctionLibrary& getFunctionLibrary (void) const
+ {
+ return m_library;
+ }
private:
const tcu::DynamicFunctionLibrary m_library;
const vk::PlatformDriver m_driver;