Ensure we use the tradefed repackaged from the tree
Test: make dist locally
Bug: 189896081
Bug: 178735007
Change-Id: I35209968190984f4ecf93450179ae3a7c8c9b5c1
Merged-In: I35209968190984f4ecf93450179ae3a7c8c9b5c1
diff --git a/test_harness/Android.mk b/test_harness/Android.mk
index 4ab8fd2..ef7b95b 100644
--- a/test_harness/Android.mk
+++ b/test_harness/Android.mk
@@ -21,9 +21,11 @@
.PHONY: tradefed-all
tradefed-all: tradefed atest_tradefed.sh
-tradefed_dist_artifacts := tradefed.jar tradefed-tests.jar tradefed-test-framework.jar loganalysis.jar tradefed-contrib.jar tf-contrib-tests.jar tradefed-isolation.jar tradefed.sh tradefed_win.bat script_help.sh atest_tradefed.sh TradeFedUiTestApp.apk TradeFedTestApp.apk version.txt
+tradefed_dist_host_jars := tradefed
+tradefed_dist_artifacts := tradefed-tests.jar tradefed-test-framework.jar loganalysis.jar tradefed-contrib.jar tf-contrib-tests.jar tradefed-isolation.jar tradefed.sh tradefed_win.bat script_help.sh atest_tradefed.sh TradeFedUiTestApp.apk TradeFedTestApp.apk version.txt
-tradefed_dist_copy_pairs := $(foreach m, $(tradefed_dist_artifacts), $(LOCAL_PATH)/../filegroups/tradefed/$(m):$(m))
+tradefed_dist_copy_pairs := $(foreach m, $(tradefed_dist_host_jars), $(call intermediates-dir-for,JAVA_LIBRARIES,$(m),HOST,COMMON)/javalib.jar:$(m).jar)
+tradefed_dist_copy_pairs += $(foreach m, $(tradefed_dist_artifacts), $(LOCAL_PATH)/../filegroups/tradefed/$(m):$(m))
tradefed_dist_artifacts :=