From 7a10601e7cea2e605cc700b281b75275b49d461d Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Thu, 26 Jul 2018 11:47:46 -0700 Subject: [PATCH] Add a version.txt file to compatibility suite zips This will avoid having to tag jar file with a manifest implementation version. Test: make cts, check the zip Bug: 111834256 Change-Id: Id809217cefb36b4779fdf41c02f5809ba22d03a1 --- core/tasks/tools/compatibility.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 6117414292..34ac1d0566 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -48,6 +48,7 @@ $(compatibility_zip): PRIVATE_DYNAMIC_CONFIG := $(test_suite_dynamic_config) $(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tools) $(test_suite_dynamic_config) $(SOONG_ZIP) | $(ADB) $(ACP) # Make dir structure $(hide) mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases + $(hide) echo $(BUILD_NUMBER_FROM_FILE) > $(PRIVATE_OUT_DIR)/tools/version.txt # Copy tools $(hide) $(ACP) -fp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) $(ACP) -fp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic)