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

Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d am: 5499092f0e

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

Change-Id: I81240fec66d2fdfe78386d4da304af95535b06d6
This commit is contained in:
Treehugger Robot
2021-11-19 04:02:05 +00:00
committed by Automerger Merge Worker
parent 546543bcd1 5499092f0e
commit bc0cc5d62c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/board_config.mk
View File

@@ -214,10 +214,8 @@ else
$(error board configuration converter failed: $(.SHELLSTATUS)) $(error board configuration converter failed: $(.SHELLSTATUS))
endif endif
$(shell $(OUT_DIR)/soong/rbcrun \ $(shell build/soong/scripts/update_out $(OUT_DIR)/rbc/rbc_board_config_results.mk \
RBC_OUT="make,global" \ $(OUT_DIR)/soong/rbcrun RBC_OUT="make,global" $(OUT_DIR)/rbc/boardlauncher.rbc)
$(OUT_DIR)/rbc/boardlauncher.rbc \
>$(OUT_DIR)/rbc/rbc_board_config_results.mk)
ifneq ($(.SHELLSTATUS),0) ifneq ($(.SHELLSTATUS),0)
$(error board configuration runner failed: $(.SHELLSTATUS)) $(error board configuration runner failed: $(.SHELLSTATUS))
endif endif

4
core/product_config.mk
View File

@@ -206,8 +206,8 @@ endif
ifndef RBC_PRODUCT_CONFIG ifndef RBC_PRODUCT_CONFIG
$(call import-products, $(current_product_makefile)) $(call import-products, $(current_product_makefile))
else else
$(shell build/soong/scripts/rbc-run $(current_product_makefile) \ $(shell build/soong/scripts/update_out $(OUT_DIR)/rbctemp.mk \
>$(OUT_DIR)/rbctemp.mk) build/soong/scripts/rbc-run $(current_product_makefile))
ifneq ($(.SHELLSTATUS),0) ifneq ($(.SHELLSTATUS),0)
$(error product configuration converter failed: $(.SHELLSTATUS)) $(error product configuration converter failed: $(.SHELLSTATUS))
endif endif