Emit unconditional module load only when inherit/include is on the top level.
That is, when a makefile contains
```
ifneq (,$(foo))
$(call inherit-product,module.mk)
endif
```
module.mk has to be present only if `foo` is set.
Fixes: 200163602
Test: internal
Change-Id: Ic5f10ce8d49d6b87162bfe77922bba5e2cce228b
diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go
index ca7fe6f..434500b 100644
--- a/mk2rbc/mk2rbc_test.go
+++ b/mk2rbc/mk2rbc_test.go
@@ -120,22 +120,25 @@
desc: "Inherit configuration always",
mkname: "product.mk",
in: `
-ifdef PRODUCT_NAME
$(call inherit-product, part.mk)
+ifdef PRODUCT_NAME
+$(call inherit-product, part1.mk)
else # Comment
-$(call inherit-product, $(LOCAL_PATH)/part.mk)
+$(call inherit-product, $(LOCAL_PATH)/part1.mk)
endif
`,
expected: `load("//build/make/core:product_config.rbc", "rblf")
load(":part.star", _part_init = "init")
+load(":part1.star|init", _part1_init = "init")
def init(g, handle):
cfg = rblf.cfg(handle)
+ rblf.inherit(handle, "part", _part_init)
if g.get("PRODUCT_NAME") != None:
- rblf.inherit(handle, "part", _part_init)
+ rblf.inherit(handle, "part1", _part1_init)
else:
# Comment
- rblf.inherit(handle, "part", _part_init)
+ rblf.inherit(handle, "part1", _part1_init)
`,
},
{
@@ -158,22 +161,25 @@
desc: "Include configuration",
mkname: "product.mk",
in: `
-ifdef PRODUCT_NAME
include part.mk
+ifdef PRODUCT_NAME
+include part1.mk
else
--include $(LOCAL_PATH)/part.mk)
+-include $(LOCAL_PATH)/part1.mk)
endif
`,
expected: `load("//build/make/core:product_config.rbc", "rblf")
-load(":part.star|init", _part_init = "init")
+load(":part.star", _part_init = "init")
+load(":part1.star|init", _part1_init = "init")
def init(g, handle):
cfg = rblf.cfg(handle)
+ _part_init(g, handle)
if g.get("PRODUCT_NAME") != None:
- _part_init(g, handle)
+ _part1_init(g, handle)
else:
- if _part_init != None:
- _part_init(g, handle)
+ if _part1_init != None:
+ _part1_init(g, handle)
`,
},