commit 285083e47555ca1042502e8e15da806bea39ecf3
author Yifan Hong <elsk@google.com> Fri Jul 27 13:28:47 2018 -0700
committer Yifan Hong <elsk@google.com> Fri Jul 27 16:24:38 2018 -0700
tree 98f92851d2f8bd9f1b30080eaf8a6e8276a3c3e2
parent 7b21221d2a46cf3ec2e1f9208d47c2218db4ccf0

Fix collapse-pairs for last empty property

If the last token in the argument for collapse-pairs is
key=, then the following lines were written:
    key
    =
This patch fixes it so that key= is written instead.

Test: specify ro.boot.logical_partitions= at the end of
ADDITIONAL_PRODUCT_PROPERTIES and `cat $OUT/product/build.prop`
shows:
ro.boot.logical_partitions=

Change-Id: I33a0efb59871f0e36a93c8fae0d75f2735994301

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1550206..3512598 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -796,8 +796,8 @@
 
 define collapse-pairs
 $(eval _cpSEP := $(strip $(if $(2),$(2),=)))\
-$(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \
-    $(subst $(_cpSEP), $(_cpSEP) ,$(1))))
+$(strip $(subst $(space)$(_cpSEP)$(space),$(_cpSEP),$(strip \
+    $(subst $(_cpSEP), $(_cpSEP) ,$(1)))$(space)))
 endef
 
 ###########################################################