Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee8cd58a authored by Cole Faust's avatar Cole Faust
Browse files

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
parent 335f594e

core/product_config.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -201,9 +201,9 @@ $(call import-products, $(current_product_makefile)) 
else

else

  rbcscript=build/soong/scripts/rbc-run

  rbcscript=build/soong/scripts/rbc-run

  rc := $(shell $(rbcscript) $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) >$(OUT_DIR)/rbctemp.mk 2>$(OUT_DIR)/rbctemp.stderr || echo $$?)

  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))

  ifneq (,$(rbcerrors))

    $(info $(rbcerrors))

    $(warning $(rbcerrors))

  endif

  endif

  ifneq (,$(rc))

  ifneq (,$(rc))

    $(error product configuration converter failed: $(rc))

    $(error product configuration converter failed: $(rc))