Merge vk-gl-cts/opengl-es-cts-3.2.4 into vk-gl-cts/master

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

diff --git a/android/cts/Android.mk b/android/cts/Android.mk
index 0686608..d43624f 100644 (file)
--- a/android/cts/Android.mk
+++ b/android/cts/Android.mk
@@ -20,19 +20,19 @@ LOCAL_MODULE := CtsDeqpTestCases
 
 LOCAL_MODULE_TAGS := optional
 
-# Tag this module as a cts_v2 test artifact
-LOCAL_COMPATIBILITY_SUITE := cts_v2
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_SDK_VERSION := 22
 
 LOCAL_SRC_FILES := $(call all-java-files-under, runner/src)
-LOCAL_JAVA_LIBRARIES := cts-tradefed_v2 compatibility-host-util tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt
 
 DEQP_CASELISTS:=$(sort $(patsubst master/%,%, \
   $(shell cd $(LOCAL_PATH) ; \
           find -L master -maxdepth 1 -name "*.txt") \
   ))
-LOCAL_COMPATIBILITY_SUPPORT_FILES := $(foreach file, $(DEQP_CASELISTS), ./master/$(file):$(file))
+LOCAL_COMPATIBILITY_SUPPORT_FILES := $(foreach file, $(DEQP_CASELISTS), $(LOCAL_PATH)/master/$(file):$(file))
 
 include $(BUILD_HOST_JAVA_LIBRARY)