diff options
| author | 2024-09-11 21:58:14 +0000 | |
|---|---|---|
| committer | 2024-09-11 21:58:14 +0000 | |
| commit | 6fbebd457060746f355c9a133003b6feefcad5df (patch) | |
| tree | d976adce0249738d99c0c2c4aef123269d5b46a6 | |
| parent | edb3ba3ae4a0fe5d4b0c058c2a5c975d9190cc16 (diff) | |
| parent | daca2e7783203a0b68f8f4f6f2ba9e23e12ba174 (diff) | |
Merge "Move copy destination to "sts-sdk"" into main
| -rw-r--r-- | core/tasks/sts-sdk.mk | 3 |
1 files changed, 1 insertions, 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 |