commit ec88e00164c43b4f7a643e737ac319f1a7ca5e4a
author Anton Hansson <hansson@google.com> Wed Nov 10 17:17:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 10 17:17:05 2021 +0000
tree 9b04ab47bee0479ed505779354305c9ed03a616d
parent 92327efd6716372160333cb3bb27d1c81521f592
parent 1564e90a14509e8e99ad5a374183d514d08beb14

Merge "Fix product single value variables failed issue" am: 0e21221d30 am: 1564e90a14

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

Change-Id: Ifdfcce9f72ad6053a6ba9284c356203a4585c01b

core/node_fns.mk

diff --git a/core/node_fns.mk b/core/node_fns.mk
index 8d20160..2243cd7 100644
--- a/core/node_fns.mk
+++ b/core/node_fns.mk
@@ -208,7 +208,7 @@
 
   $(eval $(1).$(2).inherited := \
       $(call get-inherited-nodes,$(1).$(2),$(3)))
-  $(call _import-nodes-inner,$(1),$($(1).$(2).inherited),$(3))
+  $(call _import-nodes-inner,$(1),$($(1).$(2).inherited),$(3),$(4))
 
   $(call _expand-inherited-values,$(1),$(2),$(3),$(4))