From daca2e7783203a0b68f8f4f6f2ba9e23e12ba174 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Wed, 4 Sep 2024 23:05:37 +0000 Subject: [PATCH] Move copy destination to "sts-sdk" Also remove packaged Java Bug: 364712647 Test: manual Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791 --- core/tasks/sts-sdk.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/tasks/sts-sdk.mk b/core/tasks/sts-sdk.mk index b8ce5bf4a5..4abbc29c5e 100644 --- a/core/tasks/sts-sdk.mk +++ b/core/tasks/sts-sdk.mk @@ -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