Merge "Stop using deps-license build target."
diff --git a/Android.bp b/Android.bp
index d8cd0e0..f530171 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,6 +118,7 @@
"kxml2-2.3.0",
"libprotobuf-java-full",
"platform-test-annotations",
+ "snakeyaml",
"tf-remote-client",
"tradefed-protos",
"tradefed-isolation-protos",
diff --git a/Android.mk b/Android.mk
index 2879077..a868149 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,11 +23,14 @@
deps := $(call copy-many-files,\
$(call intermediates-dir-for,JAVA_LIBRARIES,tradefed,HOST)/javalib.jar:$(HOST_OUT)/tradefed/tradefed.jar)
+fwk_deps := $(call copy-many-files,\
+ $(call intermediates-dir-for,JAVA_LIBRARIES,tradefed,HOST)/javalib.jar:$(HOST_OUT)/tradefed/tradefed-test-framework.jar)
+
isodeps := $(call copy-many-files,\
$(call intermediates-dir-for,JAVA_LIBRARIES,tradefed-isolation,HOST)/javalib.jar:$(HOST_OUT)/tradefed/tradefed-isolation.jar)
# this dependency ensures the above rule will be executed if jar is installed
-$(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar : $(deps) $(isodeps)
+$(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar : $(deps) $(isodeps) $(fwk_deps)
# The copy rule for loganalysis is in tools/loganalysis/Android.mk
$(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar : $(HOST_OUT)/tradefed/loganalysis.jar
@@ -37,7 +40,7 @@
# Note that this is incompatible with `make dist`. If you want to make
# the distribution, you must run `tapas` with the individual target names.
.PHONY: tradefed-core
-tradefed-core: tradefed tradefed-isolation atest_tradefed.sh tradefed-contrib tf-contrib-tests script_help.sh tradefed.sh
+tradefed-core: tradefed tradefed-isolation tradefed-test-framework atest_tradefed.sh tradefed-contrib tf-contrib-tests script_help.sh tradefed.sh
.PHONY: tradefed-all
tradefed-all: tradefed-core tradefed-tests tradefed_win loganalysis-tests
