diff options
| author | Kevin Cheng <kevcheng@google.com> | 2017-05-05 15:53:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-05 15:53:10 +0000 |
| commit | 5886802f8050ecf0073dce1b8c2412dd331d250d (patch) | |
| tree | 25b973f4eb264ae1a12f6e87af2a039e5bf33130 | |
| parent | 27bc2fedf91da114e273e48d022f22ca4d87eb06 (diff) | |
| parent | ca085768189f3e5f180450966d81db12437f9e22 (diff) | |
| download | tradefederation-5886802f8050ecf0073dce1b8c2412dd331d250d.tar.gz | |
Merge "Add tf contrib dep to tradefed-all."android-n-iot-preview-4n-iot-preview-4
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 79e3da785..dad1d0884 100644 --- a/Android.mk +++ b/Android.mk @@ -73,7 +73,7 @@ include $(CLEAR_VARS) # 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-all -tradefed-all: tradefed tradefed-tests tf-prod-tests tf-prod-metatests tradefed_win script_help verify +tradefed-all: tradefed tradefed-tests tf-prod-tests tf-prod-metatests tradefed_win script_help verify tradefed-contrib tf-contrib-prod-tests # ==================================== include $(CLEAR_VARS) @@ -91,7 +91,7 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) # Zip up the built files and dist it as tradefed.zip ifneq (,$(filter tradefed tradefed-all, $(TARGET_BUILD_APPS))) -tradefed_dist_host_jars := tradefed tradefed-tests tf-prod-tests emmalib loganalysis loganalysis-tests tf-remote-client +tradefed_dist_host_jars := tradefed tradefed-tests tf-prod-tests emmalib loganalysis loganalysis-tests tf-remote-client tradefed-contrib tf-contrib-prod-tests tradefed_dist_host_jar_files := $(foreach m, $(tradefed_dist_host_jars), $(HOST_OUT_JAVA_LIBRARIES)/$(m).jar) tradefed_dist_host_exes := tradefed.sh tradefed_win.bat script_help.sh verify.sh |