StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5e4bba9356b68ffe3c056cee1be6c7cf240e556a
This commit is contained in:
Treehugger Robot
2021-09-30 01:17:56 +00:00
committed by Automerger Merge Worker
parent e7b34714cc 63aa5e048e
commit 5d13787183
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/product_config.mk
View File

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