commit 3c1caa29b8cdbbb91858ecb236f40ebf042b403d
author Duy Truong <duytruong@google.com> Wed Jan 11 18:21:53 2023 -0800
committer Duy Truong <duytruong@google.com> Wed Jan 18 23:02:31 2023 +0000
tree 0b99db4acc757a4ffe3d6278ff8062f9d973fb73
parent c5f2b7f1892e4a60c70e30c30aa90df9d9b411c5

Include JDK with STS SDK like the other *TS suites.

Bug: 238373261
Test: Build and run STS SDK sample
Change-Id: I7378a555393e4194917083197829201320e595b4

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