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

Commit 074651ba authored by Peter Collingbourne's avatar Peter Collingbourne Committed by android-build-merger
Browse files

Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip." 

am: 0f9ac40d

Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
parents 0a416ce0 0f9ac40d

core/tasks/tools/compatibility.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ $(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tool 
# Copy tools

# Copy tools

	$(hide) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools

	$(hide) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools

	$(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic)

	$(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic)

	$(hide) find $(dir $@)/$(PRIVATE_NAME) | sort >$@.list

	$(hide) find $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases | sort >$@.list

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list





# Reset all input variables

# Reset all input variables