StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update sts-sdk to use new source" into main am: 9fe7f1fa9e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3206023

Change-Id: I756c12981f92d3e208b125cbcd3288d7d6135af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-08 18:36:09 +00:00
committed by Automerger Merge Worker
parent 86c236caef 9fe7f1fa9e
commit 0038482750
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/tasks/sts-lite.mk → core/tasks/sts-sdk.mk
View File

@@ -13,26 +13,25 @@
# limitations under the License.
ifneq ($(wildcard test/sts/README-sts-sdk.md),)
test_suite_name := sts-lite
test_suite_name := sts-sdk
test_suite_tradefed := sts-tradefed
test_suite_readme := test/sts/README-sts-sdk.md
sts_sdk_zip := $(HOST_OUT)/$(test_suite_name)/sts-sdk.zip
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
sts_sdk_samples := $(call intermediates-dir-for,ETC,sts-sdk-samples.zip)/sts-sdk-samples.zip
sts_sdk_plugin_skel := $(call intermediates-dir-for,ETC,sts-sdk-plugin-skel.zip)/sts-sdk-plugin-skel.zip
$(sts_sdk_zip): STS_LITE_ZIP := $(compatibility_zip)
$(sts_sdk_zip): STS_SDK_SAMPLES := $(sts_sdk_samples)
$(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples)
rm -f $@ $(STS_LITE_ZIP)_filtered
$(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/jdk/**/*:sts-test/jdk/'
$(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES)
rm -f $(STS_LITE_ZIP)_filtered
$(sts_sdk_zip): STS_SDK_ZIP := $(compatibility_zip)
$(sts_sdk_zip): STS_SDK_PLUGIN_SKEL := $(sts_sdk_plugin_skel)
$(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_plugin_skel)
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/'
$(MERGE_ZIPS) $@ $(STS_SDK_ZIP)_filtered $(STS_SDK_PLUGIN_SKEL)
rm -f $(STS_SDK_ZIP)_filtered
.PHONY: sts-sdk
sts-sdk: $(sts_sdk_zip)