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

Commit a9aac312 authored by Ziwei Zhang's avatar Ziwei Zhang
Browse files

Pack cts-interactive into cts-verifier. 

go/cv-interactive

Test: m cts
Bug: 383428241
Change-Id: I633e63071eec0337edfc557a9fd5af4e2d4d3049
Ignore-AOSP-First: change cts-v internally first
parent 0db39045

core/tasks/cts.mk

+15 −0
Original line number Diff line number Diff line
@@ -78,14 +78,28 @@ verifier-dir-name := android-cts-verifier 
verifier-dir := $(cts-dir)/$(verifier-dir-name)

verifier-zip-name := $(verifier-dir-name).zip

verifier-zip := $(cts-dir)/$(verifier-zip-name)

cts-interactive-zip := $(HOST_OUT)/cts-interactive/android-cts-interactive.zip



cts : $(verifier-zip)

ifeq ($(wildcard cts/tools/cts-interactive/README),)

$(verifier-zip): PRIVATE_DIR := $(cts-dir)

$(verifier-zip): $(SOONG_ANDROID_CTS_VERIFIER_ZIP)

	rm -rf $(PRIVATE_DIR)

	mkdir -p $(PRIVATE_DIR)

	unzip -q -d $(PRIVATE_DIR) $<

	$(copy-file-to-target)

else

$(verifier-zip): PRIVATE_DIR := $(cts-dir)

$(verifier-zip): PRIVATE_verifier_dir := $(verifier-dir)

$(verifier-zip): PRIVATE_interactive_zip := $(cts-interactive-zip)

$(verifier-zip): $(SOONG_ANDROID_CTS_VERIFIER_ZIP) $(cts-interactive-zip) $(SOONG_ZIP)

	rm -rf $(PRIVATE_DIR)

	mkdir -p $(PRIVATE_DIR)

	unzip -q -d $(PRIVATE_DIR) $<

	unzip -q -d $(PRIVATE_verifier_dir) $(PRIVATE_interactive_zip)

	$(SOONG_ZIP) -d -o $@ -C $(PRIVATE_DIR) -D $(PRIVATE_verifier_dir)

endif

$(call dist-for-goals, cts, $(verifier-zip))



# For producing CTS coverage reports.

# Run "make cts-test-coverage" in the $ANDROID_BUILD_TOP directory.
@@ -331,3 +345,4 @@ verifier-dir-name := 
verifier-dir :=

verifier-zip-name :=

verifier-zip :=

cts-interactive-zip :=