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

Commit daca2e77 authored by Chris Dombroski's avatar Chris Dombroski
Browse files

Move copy destination to "sts-sdk" 

Also remove packaged Java

Bug: 364712647
Test: manual
Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791
parent 9263e3e4

core/tasks/sts-sdk.mk

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_plugin_s 
	rm -f $@ $(STS_SDK_ZIP)_filtered

	$(ZIP2ZIP) -i $(STS_SDK_ZIP) -o $(STS_SDK_ZIP)_filtered \

		-x android-sts-sdk/tools/sts-tradefed-tests.jar \

		'android-sts-sdk/tools/*:plugin/src/main/resources/sts-tradefed-tools/' \

		'android-sts-sdk/jdk/**/*:plugin/src/main/resources/jdk/'

		'android-sts-sdk/tools/*:sts-sdk/src/main/resources/sts-tradefed-tools/'

	$(MERGE_ZIPS) $@ $(STS_SDK_ZIP)_filtered $(STS_SDK_PLUGIN_SKEL)

	rm -f $(STS_SDK_ZIP)_filtered