From cceb7ab6d705c8f4fed8d7f3e190f53647c291c1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 20 Aug 2018 19:21:29 -0700 Subject: [PATCH] Fix reference to cleared global variable Use PRIVATE_general_tests_list_zip inside the rule. Also remove the output files to make it more likely that an incremental build fails the same was as a clean build. Bug: 112865316 Test: rm $OUT/general-tests* && m general-tests Change-Id: Idbca35f9ca71f65ef45ef026df41bd933fb9d37d --- core/tasks/general-tests.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk index b28f8ef714..9619bbe6b7 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -28,6 +28,7 @@ $(general_tests_zip) : PRIVATE_TOOLS := $(general_tests_tools) $(general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir) $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(SOONG_ZIP) rm -rf $(PRIVATE_INTERMEDIATES_DIR) + rm -f $@ $(PRIVATE_general_tests_list_zip) mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools echo $(sort $(COMPATIBILITY.general-tests.FILES)) | tr " " "\n" > $(PRIVATE_INTERMEDIATES_DIR)/list grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/host.list || true @@ -39,7 +40,7 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list grep -e .*.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list grep -e .*.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list - $(SOONG_ZIP) -d -o $(general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list + $(SOONG_ZIP) -d -o $(PRIVATE_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list general-tests: $(general_tests_zip) $(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip))