openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If863889189d69fd26c327480c7d8943ec77afebb
This commit is contained in:
Anton Hansson 2020-12-09 12:34:08 +00:00 committed by Automerger Merge Worker
parent 8d22aadd1b 63722db3db
commit 314a943bd3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@ -547,6 +547,12 @@ $(PGO_PROFILE_MISSING):
$(call dist-for-goals,droidcore,$(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 # The dev key is used to sign this package, and as the key required
# for future OTA packages installed by this system. Actual product # for future OTA packages installed by this system. Actual product

6
core/main.mk
View File

@ -1324,12 +1324,6 @@ ifdef FULL_BUILD
$(TARGET_OUT_SYSTEM_OTHER)/%.art $(TARGET_OUT_SYSTEM_OTHER)/%.art
endif 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 := all_offending_files :=
$(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \ $(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \