commit 15b12d099a178085bfa52996b125e60849a9ccac
author Kelvin Zhang <zhangkelvin@google.com> Mon Aug 22 17:10:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 22 17:10:12 2022 +0000
tree 77611d10f8f5c94557aebad12e4cbd208d594218
parent 8dec280fec5a85cf0be5cf27a0f8fd44c141fa24
parent 253b106f95956e00d0e9873e583bbbded2849397

Merge "set up the salt for partitions without build.prop"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f28935b..171dbde 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5021,7 +5021,7 @@
 
 INTERNAL_OTATOOLS_PACKAGE_FILES += \
   $(sort $(shell find build/make/target/product/security -type f -name "*.x509.pem" -o \
-      -name "*.pk8" -o -name verity_key))
+      -name "*.pk8"))
 
 ifneq (,$(wildcard device))
 INTERNAL_OTATOOLS_PACKAGE_FILES += \

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index d3eab95..cd36011 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3836,6 +3836,10 @@
 -include $(TOPDIR)vendor/*/build/core/definitions.mk
 -include $(TOPDIR)device/*/build/core/definitions.mk
 -include $(TOPDIR)product/*/build/core/definitions.mk
+# Also the project-specific definitions.mk file
+-include $(TOPDIR)vendor/*/*/build/core/definitions.mk
+-include $(TOPDIR)device/*/*/build/core/definitions.mk
+-include $(TOPDIR)product/*/*/build/core/definitions.mk
 
 # broken:
 #	$(foreach file,$^,$(if $(findstring,.a,$(suffix $file)),-l$(file),$(file)))