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

Commit 151cd4c7 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Sort inputs to compatibility suite zip files" am: 32829045 am: a2b1052a 

am: ba89e33a

Change-Id: I9831de58c41545dc1e0e40edadd96a83df3b70a1
parents 2e68205f ba89e33a

core/tasks/device-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


device-tests-zip := $(PRODUCT_OUT)/device-tests.zip

$(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP)

	echo $(COMPATIBILITY.device-tests.FILES) > $@.list

	echo $(sort $(COMPATIBILITY.device-tests.FILES)) > $@.list

	sed -i -e 's/\s\+/\n/g' $@.list

	grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true

core/tasks/general-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


general-tests-zip := $(PRODUCT_OUT)/general-tests.zip

$(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)

	echo $(COMPATIBILITY.general-tests.FILES) > $@.list

	echo $(sort $(COMPATIBILITY.general-tests.FILES)) > $@.list

	sed -i -e 's/\s\+/\n/g' $@.list

	grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true