commit dff3b7e2101df9b99cfa485354da38cc7ab52ee5
author Duy Truong <duytruong@google.com> Fri Jan 20 08:44:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 20 08:44:30 2023 +0000
tree 903dbe97c2f53cdd553378d5fa005ac2f19e4344
parent dfcbebca82151e1bd50fbf448bb17f94630d0ec6
parent 6ee3acaf901b5f5f3891a5e3944706eef17ab56d

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev

* changes:
  [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
  Include JDK with STS SDK like the other *TS suites.

core/tasks/sts-lite.mk

diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk
index dee25d4..65c65c3 100644
--- a/core/tasks/sts-lite.mk
+++ b/core/tasks/sts-lite.mk
@@ -29,7 +29,8 @@
 	$(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \
 		-x android-sts-lite/tools/sts-tradefed-tests.jar \
 		'android-sts-lite/tools/*:sts-test/libs/' \
-		'android-sts-lite/testcases/*:sts-test/utils/'
+		'android-sts-lite/testcases/*:sts-test/utils/' \
+		'android-sts-lite/jdk/**/*:sts-test/jdk/'
 	$(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES)
 	rm -f $(STS_LITE_ZIP)_filtered