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

Commit dff3b7e2 authored by Duy Truong's avatar Duy Truong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev 

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

core/tasks/sts-lite.mk

+2 −1
Original line number Original line 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 \

	$(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