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

Commit a2b1052a 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

Change-Id: Idf090f0f7cd7c7d88621dbb26a21b9ef44621e94
parents 0d694416 32829045

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