Merge "device-tests & general-tests: build out zips." am: dd908dd925

am: 0aa305aacc

Change-Id: I7c45274e789d1722c333b1dcfa2be50c1cd685fc
This commit is contained in:
Simran Basi 2017-03-17 17:53:20 +00:00 committed by android-build-merger
commit 38c95e4d6d
2 changed files with 22 additions and 2 deletions

View file

@ -14,4 +14,14 @@
.PHONY: device-tests
device-tests: $(COMPATIBILITY.device-tests.FILES)
device-tests-zip := $(PRODUCT_OUT)/device-tests.zip
$(device-tests-zip): $(COMPATIBILITY.device-tests.FILES) $(SOONG_ZIP)
echo $(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
$(hide) $(SOONG_ZIP) -d -o $@ -C $(HOST_OUT) -l $@-host.list -C $(PRODUCT_OUT) -l $@-target.list
device-tests: $(device-tests-zip)
$(call dist-for-goals, device-tests, $(device-tests-zip))

View file

@ -13,4 +13,14 @@
# limitations under the License.
.PHONY: general-tests
device-tests: $(COMPATIBILITY.general-tests.FILES)
general-tests-zip := $(PRODUCT_OUT)/general-tests.zip
$(general-tests-zip): $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)
echo $(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
$(hide) $(SOONG_ZIP) -d -o $@ -C $(HOST_OUT) -l $@-host.list -C $(PRODUCT_OUT) -l $@-target.list
general-tests: $(general-tests-zip)
$(call dist-for-goals, general-tests, $(general-tests-zip))