Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c am: b4dcb50d1f am: 63aa5e048e am: 5d13787183

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

Change-Id: I310791aa605430e347c8c194ec1e52d1798d6b41
This commit is contained in:
Treehugger Robot
2021-09-30 01:32:11 +00:00
committed by Automerger Merge Worker

View File

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