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

Browse Source 
* changes:
  [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
  Include JDK with STS SDK like the other *TS suites.
This commit is contained in:
Duy Truong
2023-01-20 08:44:30 +00:00
committed by Android (Google) Code Review
parent dfcbebca82 6ee3acaf90
commit dff3b7e210
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 \
-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