Commit 86d92b79 authored Jan 20, 2023 by Duy Truong Committed by Automerger Merge Worker Jan 20, 2023

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into...

Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e2 am: e82eda25 am: fc6aa53d am: fa4e1c10

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

Change-Id: Ic20cd7e386d95c207788b716ee40b96e679d282d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/tasks/sts-lite.mk

+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