| commit | 6ee3acaf901b5f5f3891a5e3944706eef17ab56d | [log] [tgz] |
|---|---|---|
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Wed Jan 18 23:02:39 2023 +0000 |
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Wed Jan 18 23:02:39 2023 +0000 |
| tree | ffffa07b8087ce6ef541f370609dcde63edd6036 | |
| parent | 70228fd7d92428c702a06feae955f41181323fdd [diff] | |
| parent | 3c1caa29b8cdbbb91858ecb236f40ebf042b403d [diff] |
[automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851 Bug: 238373261 Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
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