Build Deqp runner out of TF source

CTS is being build out of TF source directly.

Test: build cts, run cts
Bug: 32819381
Change-Id: I5c7acade37fda6eb2b75e7eb999e9bd838a78268

diff --git a/android/cts/Android.mk b/android/cts/Android.mk
index d43624f..52cc86c 100644 (file)
--- a/android/cts/Android.mk
+++ b/android/cts/Android.mk
@@ -26,7 +26,7 @@ LOCAL_COMPATIBILITY_SUITE := cts
 LOCAL_SDK_VERSION := 22
 
 LOCAL_SRC_FILES := $(call all-java-files-under, runner/src)
-LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed
 
 DEQP_CASELISTS:=$(sort $(patsubst master/%,%, \
   $(shell cd $(LOCAL_PATH) ; \

diff --git a/android/cts/runner/tests/Android.mk b/android/cts/runner/tests/Android.mk
index 7fc1056..81ba834 100644 (file)
--- a/android/cts/runner/tests/Android.mk
+++ b/android/cts/runner/tests/Android.mk
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_MODULE := CtsDeqpRunnerTests
 LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed-prebuilt CtsDeqpTestCases
+LOCAL_JAVA_LIBRARIES := cts-tradefed compatibility-host-util tradefed CtsDeqpTestCases
 LOCAL_STATIC_JAVA_LIBRARIES := easymock
 
 include $(BUILD_HOST_JAVA_LIBRARY)

diff --git a/android/cts/runner/tests/run_tests.sh b/android/cts/runner/tests/run_tests.sh
index 70a9ce7..4832995 100755 (executable)
--- a/android/cts/runner/tests/run_tests.sh
+++ b/android/cts/runner/tests/run_tests.sh
@@ -47,7 +47,7 @@ JARS="
     hosttestlib\
     CtsDeqpTestCases\
     CtsDeqpRunnerTests\
-    tradefed-prebuilt"
+    tradefed"
 JAR_PATH=
 for JAR in $JARS; do
     checkFile ${JAR_DIR}/${JAR}.jar