From 3c1caa29b8cdbbb91858ecb236f40ebf042b403d Mon Sep 17 00:00:00 2001 From: Duy Truong Date: Wed, 11 Jan 2023 18:21:53 -0800 Subject: [PATCH] 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk index dee25d4802..65c65c3dc6 100644 --- a/core/tasks/sts-lite.mk +++ b/core/tasks/sts-lite.mk @@ -29,7 +29,8 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) $(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