Bundle CTS USB Accessory Tool with CTS Verifier
Bundle cts-usb-accessory with the android-cts-verifier.zip
and don't include it with the CTS anymore.
Change-Id: I05044fa91b28f550f5b91443cbbaf59d7d4d4826
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 1a39fd3..32aaa25 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -53,10 +53,11 @@
verifier-zip := $(cts-dir)/$(verifier-zip-name)
cts : $(verifier-zip)
-$(verifier-zip) : CtsVerifier $(ACP)
+$(verifier-zip) : CtsVerifier $(ACP) $(HOST_OUT)/bin/cts-usb-accessory
$(hide) mkdir -p $(verifier-dir)
$(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,CtsVerifier)/package.apk \
$(verifier-dir)/CtsVerifier.apk
+ $(hide) $(ACP) -fp $(HOST_OUT)/bin/cts-usb-accessory $(verifier-dir)/cts-usb-accessory
$(hide) cd $(cts-dir) && zip -rq $(verifier-dir-name) $(verifier-dir-name)
ifneq ($(filter cts, $(MAKECMDGOALS)),)