Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee3acaf authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29

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

Bug: 238373261
Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
parents 70228fd7 3c1caa29
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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