[Harness Separation] Fix some references to tools/cts-tradefed
Fix references to tools/cts-tradefed in
* run_unit_tests.sh
* and two comments
Bug: 78461075
Bug: 79201478
Test: make cts -j32 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true TARGET_PRODUCT=aosp_arm64
Test: cts-tradefed run cts --compatibility:include-filter CtsGestureTestCases
Test: cts/run_unit_tests.sh
Change-Id: Ief12d5e60a63c19a5a6ecc265140296c72d44b42
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
index cd7518e..d170263 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
@@ -48,7 +48,7 @@
super(reportLogName, streamName);
try {
// dir value must match the src-dir value configured in ReportLogCollector target
- // preparer in cts/tools/cts-tradefed/res/config/cts-preconditions.xml
+ // preparer in cts/harness/tools/cts-tradefed/res/config/cts-preconditions.xml
if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
throw new IOException("External storage is not mounted");
} else if ((!logDirectory.exists() && !logDirectory.mkdirs())
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java b/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
index c45972d..39b5e33 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
@@ -31,7 +31,7 @@
private final IBuildInfo mBuildInfo;
// Temporary folder must match the temp-dir value configured in ReportLogCollector target
- // preparer in cts/tools/cts-tradefed/res/config/cts-oreconditions.xml
+ // preparer in cts/harness/tools/cts-tradefed/res/config/cts-oreconditions.xml
private static final String TEMPORARY_REPORT_FOLDER = "temp-report-logs";
private ReportLogHostInfoStore store;
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index 3f29832..aaf0b1b 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -72,4 +72,6 @@
${CTS_DIR}/common/host-side/util/tests/run_tests.sh
${CTS_DIR}/common/util/tests/run_tests.sh
-${CTS_DIR}/tools/cts-tradefed/tests/run_tests.sh
+# TODO: Change it to the new harness repo once harness
+# code is moved to its own repo. [fix-harness-dir]
+${CTS_DIR}/harness/tools/cts-tradefed/tests/run_tests.sh