commit af9e7f04c328504f0e4c7ac5ec0cf365894621b6
author Yifan Hong <elsk@google.com> Fri Jul 27 13:11:50 2018 -0700
committer Yifan Hong <elsk@google.com> Fri Jul 27 16:24:38 2018 -0700
tree 0c2af744ca7c0c08f8f0c0e6d392e339e8822eae
parent 285083e47555ca1042502e8e15da806bea39ecf3

ro.boot.logical_partitions moved to product image

Test: m productimage -j && cat $OUT/product/build.prop
Bug: 111909365
Change-Id: I62abd5602f6b2fe7eead9d636ffb7708df23fd02

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9c26b8b..5f13ec8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -443,7 +443,7 @@
 ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_BUILD_PROP_TARGET)
 
 FINAL_PRODUCT_PROPERTIES += \
-    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES))
+    $(call collapse-pairs, $(PRODUCT_PRODUCT_PROPERTIES) $(ADDITIONAL_PRODUCT_PROPERTIES))
 FINAL_PRODUCT_PROPERTIES := $(call uniq-pairs-by-first-component, \
     $(FINAL_PRODUCT_PROPERTIES),=)