dEQP-VK.compute: Fix layout of storage image descriptor

[platform/upstream/VK-GL-CTS.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index a769d34..9cdbe32 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := \
        executor/xeXMLWriter.cpp \
        framework/common/tcuApp.cpp \
        framework/common/tcuArray.cpp \
+       framework/common/tcuAstcUtil.cpp \
        framework/common/tcuBilinearImageCompare.cpp \
        framework/common/tcuCommandLine.cpp \
        framework/common/tcuCompressedTexture.cpp \
@@ -661,6 +662,7 @@ LOCAL_SRC_FILES := \
        modules/glshared/glsTextureTestUtil.cpp \
        modules/glshared/glsUniformBlockCase.cpp \
        modules/glshared/glsVertexArrayTests.cpp \
+       modules/internal/ditAstcTests.cpp \
        modules/internal/ditBuildInfoTests.cpp \
        modules/internal/ditSRGB8ConversionTest.cpp \
        modules/internal/ditDelibsTests.cpp \
@@ -734,16 +736,18 @@ LOCAL_SHARED_LIBRARIES := \
                liblog \
                libm \
                libc \
-               libpng \
                libz \
                libdl
 
+LOCAL_STATIC_LIBRARIES := \
+               libpng_ndk \
+
 LOCAL_CFLAGS += \
        $(deqp_compile_flags) \
        -Wno-error=date-time
 
 LOCAL_SDK_VERSION := 9
-LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
+LOCAL_CPPFLAGS += -Wno-non-virtual-dtor -fwrapv
 LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions
 LOCAL_MULTILIB := both