From cd8fa36cbb681df753d5dabd67b6a147ed3d5ae2 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 8 Dec 2020 20:56:02 +0000
Subject: [PATCH] Move rule for certificate_violation_modules.txt

It was in the middle of some other logic in main.mk

Put it in Makefile instead next to the other "information" dist txt
files.

Test: make and diff certificate_violation_modules.txt
Change-Id: I5b73a0f89ccf3de69e7608a0568d2b4b6f37e98c
---
 core/Makefile | 6 ++++++
 core/main.mk  | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 6656a1999..61dbaf5ef 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -547,6 +547,12 @@ $(PGO_PROFILE_MISSING):
 
 $(call dist-for-goals,droidcore,$(PGO_PROFILE_MISSING))
 
+CERTIFICATE_VIOLATION_MODULES_FILENAME := $(PRODUCT_OUT)/certificate_violation_modules.txt
+$(CERTIFICATE_VIOLATION_MODULES_FILENAME):
+	rm -f $@
+	$(foreach m,$(sort $(CERTIFICATE_VIOLATION_MODULES)), echo $(m) >> $@;)
+$(call dist-for-goals,droidcore,$(CERTIFICATE_VIOLATION_MODULES_FILENAME))
+
 # -----------------------------------------------------------------
 # The dev key is used to sign this package, and as the key required
 # for future OTA packages installed by this system.  Actual product
diff --git a/core/main.mk b/core/main.mk
index d8a04432e..8cfaeddcf 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1324,12 +1324,6 @@ ifdef FULL_BUILD
       $(TARGET_OUT_SYSTEM_OTHER)/%.art
   endif
 
-CERTIFICATE_VIOLATION_MODULES_FILENAME := $(PRODUCT_OUT)/certificate_violation_modules.txt
-$(CERTIFICATE_VIOLATION_MODULES_FILENAME):
-	rm -f $@
-	$(foreach m,$(sort $(CERTIFICATE_VIOLATION_MODULES)), echo $(m) >> $@;)
-$(call dist-for-goals,droidcore,$(CERTIFICATE_VIOLATION_MODULES_FILENAME))
-
   all_offending_files :=
   $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
     $(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \