Fix Android build

Fixes copy & paste error.
Disables Sys V shared memory for Android as it is unsupported.

Components: Vulkan

Affects:
*

VK-GL-CTS issue: 3756

Change-Id: I45a24916e57a8c77a1fb0e88e89927ca34069b52

diff --git a/external/vulkancts/framework/vulkan/CMakeLists.txt b/external/vulkancts/framework/vulkan/CMakeLists.txt
index 71259c1..4aab8e4 100644 (file)
--- a/external/vulkancts/framework/vulkan/CMakeLists.txt
+++ b/external/vulkancts/framework/vulkan/CMakeLists.txt
@@ -218,6 +218,8 @@ if(DEQP_HAVE_RENDERDOC_HEADER)
        add_definitions(-DDEQP_HAVE_RENDERDOC_HEADER=1)
 endif()
 
+add_definitions(-DDISABLE_SHADERCACHE_IPC)
+
 PCH(VKUTILNOSHADER_SRCS ../../modules/vulkan/pch.cpp)
 PCH(VKUTIL_SRCS ../../modules/vulkan/pch.cpp)
 PCH(VKUTILNOSHADER_INLS ../../modules/vulkan/pch.cpp)

diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
index ebf0172..69ab384 100644 (file)
--- a/framework/platform/android/tcuAndroidPlatform.cpp
+++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -324,7 +324,7 @@ bool Platform::processEvents (void)
 
 vk::Library* Platform::createLibrary (const char* libraryPath) const
 {
-       return new VulkanLibrary(const char* libraryPath);
+       return new VulkanLibrary(libraryPath);
 }
 
 void Platform::describePlatform (std::ostream& dst) const