Update build rules

Change-Id: I942c862d01879de429b7ac7bebc20016637721fe

5 files changed, 13 insertions, 13 deletions

diff --git a/AfwTestHarnessBuild.mk b/AfwTestHarnessBuild.mk
index a315af4..fbf530f 100644
--- a/AfwTestHarnessBuild.mk
+++ b/AfwTestHarnessBuild.mk
@@ -17,7 +17,7 @@
 -include test/AfwTestHarness/AfwTestCaseList.mk
 
 afw_th_src_dir := test/AfwTestHarness
-afw_th_dir := $(HOST_OUT)/afw-test
+afw_th_dir := $(HOST_OUT)/afw-th
 afw_th_tools_src_dir := $(afw_th_src_dir)/tools
 afw_th_tests_src_dir := $(afw_th_src_dir)/tests
 
@@ -52,7 +52,7 @@ $(DEFAULT_TEST_PLAN): $(afw_th_dir)/all_afw_th_files_stamp $(afw_th_tools_src_di
 
 afw_th_name := android-afw-test-harness
 
-# Package afw-test and clean up.
+# Package afw-test-harness and clean up.
 #
 INTERNAL_AFW_TH_TARGET := $(afw_th_dir)/$(afw_th_name).zip
 $(INTERNAL_AFW_TH_TARGET): PRIVATE_NAME := android-cts
@@ -66,4 +66,4 @@ $(INTERNAL_AFW_TH_TARGET): $(afw_th_dir)/all_afw_th_files_stamp $(DEFAULT_TEST_P
 
 .PHONY: afw-test-harness
 afw-test-harness: $(INTERNAL_AFW_TH_TARGET) adb
-
+$(call dist-for-goals,afw-test-harness,$(INTERNAL_AFW_TEST_TARGET))
diff --git a/README b/README
index 2c689b6..14c2ec3 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ To build Afw Test Harness, browse to this directory and then:
 
 Similar to CTS, "make afw-test-harness" will create a directory,
 
-  out/host/<platform>/afw-test/android-cts
+  out/host/<platform>/afw-th/android-cts
 
 which contains all necessary binaries, configuration files and tools to run the
 test suite. This directory is also zipped into a file, android-afw-test-harness.zip,
@@ -81,10 +81,10 @@ Run Afw Test Harness
    Type 'list plans' to see all the test plans.
 
    Plan definitions can be found in:
-     out/host/<platform>/afw-test/android-cts/repository/plans.
+     out/host/<platform>/afw-th/android-cts/repository/plans.
 
   Each test plan is a xml file which contains all or several test packages from
-  afw-test/tests.
+  AfwTestHarness/tests.
 
   Plan 'afw-userdebug-build' contains all test packages that require a userdebug build.
   Plan 'afw-user-build' can run on user build but requires the test device to be setup
diff --git a/build/config.mk b/build/config.mk
index b2bd5e5..e711f0b 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-AFW_TH_TESTCASES_OUT := $(HOST_OUT)/afw-test/android-cts/repository/testcases
+AFW_TH_TESTCASES_OUT := $(HOST_OUT)/afw-th/android-cts/repository/testcases
 
 # default module config filename
 AFW_TEST_MODULE_TEST_CONFIG := AndroidTest.xml
diff --git a/tools/Android.mk b/tools/Android.mk
index c31684f..58e91e5 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -17,10 +17,10 @@
 AFW_TEST_TF_JAR := $(HOST_OUT_JAVA_LIBRARIES)/afw-test-tradefed.jar
 AFW_TEST_TF_EXEC_PATH ?= $(HOST_OUT_EXECUTABLES)/afw-test-tradefed
 
-afw_test_prebuilt_jar := $(HOST_OUT)/afw-test/android-cts/tools/afw-test-prebuilt.jar
-$(afw_test_prebuilt_jar): PRIVATE_TESTS_DIR := $(HOST_OUT)/afw-test/android-cts/repository/testcases
-$(afw_test_prebuilt_jar): PRIVATE_PLANS_DIR := $(HOST_OUT)/afw-test/android-cts/repository/plans
-$(afw_test_prebuilt_jar): PRIVATE_TOOLS_DIR := $(HOST_OUT)/afw-test/android-cts/tools
+afw_test_prebuilt_jar := $(HOST_OUT)/afw-th/android-cts/tools/afw-test-prebuilt.jar
+$(afw_test_prebuilt_jar): PRIVATE_TESTS_DIR := $(HOST_OUT)/afw-th/android-cts/repository/testcases
+$(afw_test_prebuilt_jar): PRIVATE_PLANS_DIR := $(HOST_OUT)/afw-th/android-cts/repository/plans
+$(afw_test_prebuilt_jar): PRIVATE_TOOLS_DIR := $(HOST_OUT)/afw-th/android-cts/tools
 $(afw_test_prebuilt_jar): $(TF_JAR) $(AFW_TEST_TF_JAR) $(AFW_TEST_TF_EXEC_PATH) | $(ACP) $(HOST_OUT_EXECUTABLES)/adb
 	mkdir -p $(PRIVATE_TESTS_DIR)
 	mkdir -p $(PRIVATE_PLANS_DIR)
diff --git a/tools/tradefed-host/etc/afw-test-tradefed b/tools/tradefed-host/etc/afw-test-tradefed
index 6f9af69..8c67244 100755
--- a/tools/tradefed-host/etc/afw-test-tradefed
+++ b/tools/tradefed-host/etc/afw-test-tradefed
@@ -65,9 +65,9 @@ fi
 # check if in Android build env
 if [ ! -z "${ANDROID_BUILD_TOP}" ]; then
     if [ ! -z "${ANDROID_HOST_OUT}" ]; then
-      CTS_ROOT=${ANDROID_HOST_OUT}/afw-test
+      CTS_ROOT=${ANDROID_HOST_OUT}/afw-th
     else
-      CTS_ROOT=${ANDROID_BUILD_TOP}/${OUT_DIR:-out}/host/${OS}/afw-test
+      CTS_ROOT=${ANDROID_BUILD_TOP}/${OUT_DIR:-out}/host/${OS}/afw-th
     fi
     if [ ! -d ${CTS_ROOT} ]; then
         echo "Could not find $CTS_ROOT in Android build environment. Try 'make afw-test-harness'"