diff options
| author | Duy Truong <duytruong@google.com> | 2023-01-20 08:44:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-01-20 08:44:30 +0000 |
| commit | f318e46c60a526b3032df4269e2bca4996236138 (patch) | |
| tree | cc4e41dddb9277c889bc2805d4ff559b49c70e2f | |
| parent | 34ec5ba13e101aa8987853c02805336b2b2d884c (diff) | |
| parent | 3c1caa29b8cdbbb91858ecb236f40ebf042b403d (diff) | |
| download | build-f318e46c60a526b3032df4269e2bca4996236138.tar.gz | |
Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev
| -rw-r--r-- | core/tasks/sts-lite.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 |