From 3e3cbeb3a55358a9094280881246461b154db8e2 Mon Sep 17 00:00:00 2001
From: Herbert Xue <herbertxue@google.com>
Date: Thu, 29 Aug 2024 11:12:10 +0800
Subject: [PATCH] Move COMPATIBILITY.tradefed_tests_dir to proper place

Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
---
 core/tasks/tradefed-tests-list.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/tasks/tradefed-tests-list.mk b/core/tasks/tradefed-tests-list.mk
index 61bf13695d..47c360de52 100644
--- a/core/tasks/tradefed-tests-list.mk
+++ b/core/tasks/tradefed-tests-list.mk
@@ -15,6 +15,11 @@
 # List all TradeFed tests from COMPATIBILITY.tradefed_tests_dir
 .PHONY: tradefed-tests-list
 
+COMPATIBILITY.tradefed_tests_dir := \
+  $(COMPATIBILITY.tradefed_tests_dir) \
+  tools/tradefederation/core/res/config \
+  tools/tradefederation/core/javatests/res/config
+
 tradefed_tests :=
 $(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \
   $(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml")))