Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
Change-Id: I598c6d52ece7b00a8dd0af10b31ea144ebc6ba80

Android.mk

index ea13fd3..253f085 100644 (file)
@@ -749,8 +749,6 @@ LOCAL_SRC_FILES := \
        external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp \
-       external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp \
-       external/vulkancts/modules/vulkan/draw/vktDrawShaderDrawParametersTests.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawSimpleTest.cpp \
        external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp \
        external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateBaseClass.cpp \