StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I2e3b230bd9933ce98c289711d4125884aed70161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Duy Truong
2023-01-20 11:16:54 +00:00
committed by Automerger Merge Worker
parent 639511b495 fc6aa53d53
commit fa4e1c1083
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tasks/sts-lite.mk
View File

@@ -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 \ $(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \
-x android-sts-lite/tools/sts-tradefed-tests.jar \ -x android-sts-lite/tools/sts-tradefed-tests.jar \
'android-sts-lite/tools/*:sts-test/libs/' \ '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) $(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES)
rm -f $(STS_LITE_ZIP)_filtered rm -f $(STS_LITE_ZIP)_filtered