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

Commit 314a943b authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Move rule for certificate_violation_modules.txt" am: 63722db3 

Original change: https://android-review.googlesource.com/c/platform/build/+/1517923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If863889189d69fd26c327480c7d8943ec77afebb
parents 8d22aadd 63722db3

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -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

core/main.mk

+0 −6
Original line number Diff line number Diff line
@@ -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)) \