diff options
| author | Duy Truong <duytruong@google.com> | 2023-01-20 10:09:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-20 10:09:01 +0000 |
| commit | fc6aa53d53e46e34a5ade4f3ba341f64031b4ac6 (patch) | |
| tree | 0e8f55840c475e1c0e56b61f7bb242c2f2bbea40 | |
| parent | 7097a237807c0caf45736cd926564839d85bec43 (diff) | |
| parent | e82eda2562ef79d237d66eb7a0e443a939ad465d (diff) | |
| download | build-fc6aa53d53e46e34a5ade4f3ba341f64031b4ac6.tar.gz | |
Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |