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

Commit 5d137871 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show mk2rbc warnings when they occur" am: 64bc620d am: b4dcb50d am: 63aa5e04 

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

Change-Id: I5e4bba9356b68ffe3c056cee1be6c7cf240e556a
parents e7b34714 63aa5e04

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