Merge "CTS Verifier Version 3.1 R1" into honeycomb-mr1
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index c4a0993..be6d69d 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -82,5 +82,4 @@
$(CTS_SECURITY_APPS_LIST)
# The following files will be placed in the tools directory of the CTS distribution
-CTS_TOOLS_LIST := \
- $(HOST_OUT)/bin/cts-usb-accessory
+CTS_TOOLS_LIST :=
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)),)
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 4db9d26..2100112 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -256,8 +256,8 @@
<!-- Strings for USB accessory test activity -->
<string name="usb_accessory_test">USB Accessory Test</string>
<string name="usb_accessory_test_info">
- 1. Connect your Android device to a computer and run the \'cts-usb-accessory\' program from
- the CTS tools directory.
+ 1. Connect your Android device to a computer and run the \'cts-usb-accessory\' program
+ included with the CTS Verifier bundle.
\n\n2. If you have not started the CTS Verifier, press \'OK\' when asked to open the CTS
Verifier when the accessory is connected. \n\nIf you are already in this test,
then you can press \'Cancel\' but press \'OK\' in the next dialog asking whether to allow