From ee8cd58a8562b7c1bf3f43027a2dcfa6129ed29d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 28 Sep 2021 11:30:03 -0700 Subject: [PATCH] Show mk2rbc warnings when they occur There was a missing $ for variable expansion, and $(info) does not seem to show up in soong output, but $(warning) does. Fixes: 201431870 Test: After introducing a problem in mk2rbc: m RBC_PRODUCT_CONFIG=1 nothing Change-Id: Ife7786d27a7315e873ea125ca361e684ffb79e1e --- core/product_config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/product_config.mk b/core/product_config.mk index 3b02acf3e2..b631294105 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -201,9 +201,9 @@ $(call import-products, $(current_product_makefile)) else rbcscript=build/soong/scripts/rbc-run rc := $(shell $(rbcscript) $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) >$(OUT_DIR)/rbctemp.mk 2>$(OUT_DIR)/rbctemp.stderr || echo $$?) - rbcerrors := $(file <(OUT_DIR)/rbctemp.stderr) + rbcerrors := $(file <$(OUT_DIR)/rbctemp.stderr) ifneq (,$(rbcerrors)) - $(info $(rbcerrors)) + $(warning $(rbcerrors)) endif ifneq (,$(rc)) $(error product configuration converter failed: $(rc))