commit 0e4a5ad24b6c4ecf93b756d8e6617d7ceabbc334
author Sasha Smundak <asmundak@google.com> Thu May 13 13:37:53 2021 -0700
committer Sasha Smundak <asmundak@google.com> Thu Jul 29 10:57:06 2021 -0700
tree 3ad863b38e9ee166914e1d416dccfc0a1663224c
parent 31b6b9442a4d8017f283925c27dab2217fa8e558

Trim spaces in the rule actions

When rule action contains something like
  cp $(FOO) ...
and FOO is set with
FOO := a \
 b \

the generated Ninja file constains extra spaces, making it
difficult to compare it to the same file generated by the
Starlark-based product configuration.

Bug: 181797530
Test: manual
Change-Id: I278bd8edf0f017a31c5b5115b2a38f4f663c55fc

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 21f4387..cb97503 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -355,7 +355,7 @@
 ADDITIONAL_PRODUCT_PROPERTIES += ro.build.characteristics=$(TARGET_AAPT_CHARACTERISTICS)
 
 ifeq ($(AB_OTA_UPDATER),true)
-ADDITIONAL_PRODUCT_PROPERTIES += ro.product.ab_ota_partitions=$(subst $(space),$(comma),$(AB_OTA_PARTITIONS))
+ADDITIONAL_PRODUCT_PROPERTIES += ro.product.ab_ota_partitions=$(subst $(space),$(comma),$(strip $(AB_OTA_PARTITIONS)))
 endif
 
 # -----------------------------------------------------------------