diff options
| author | 2019-08-21 12:31:37 -0700 | |
|---|---|---|
| committer | 2019-08-21 12:31:41 -0700 | |
| commit | bbddfcf7bad5c6021f608182eae4808b71b0769c (patch) | |
| tree | 6ce128c93d8bb7d7ea9220f5cc135de5db5e332e | |
| parent | e6012c88263bb7c7e0e436dc04cd9fec4b46691d (diff) | |
Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.
Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index f4803001ff..b6dd39eb08 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -55,7 +55,7 @@ $(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tool # Copy 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) - $(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 # Reset all input variables |