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

Inline rbc-run script

Browse Source 
The board configuration already had this inlined, and the addition
of a separate script makes it harder to follow what's happening.

Bug: 280685526
Test: ./build/bazel/ci/rbc_dashboard.py --quick aosp_arm64-userdebug
Change-Id: Ib76c4a46932ae81d84f854fbee5b0453266d6497
This commit is contained in:
Cole Faust
2023-05-04 18:00:11 -07:00
parent 51e1e93a98
commit 78d0254e9e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/product_config.mk
View File

@@ -236,14 +236,22 @@ else
$(shell mkdir -p $(OUT_DIR)/rbc) $(shell mkdir -p $(OUT_DIR)/rbc)
$(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_product_config.mk) $(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_product_config.mk)
$(shell build/soong/scripts/update_out \ $(shell $(OUT_DIR)/mk2rbc \
$(OUT_DIR)/rbc/rbc_product_config_results.mk \ --mode=write -r --outdir $(OUT_DIR)/rbc \
build/soong/scripts/rbc-run \ --launcher=$(OUT_DIR)/rbc/launcher.rbc \
$(current_product_makefile) \ --input_variables=$(OUT_DIR)/rbc/make_vars_pre_product_config.mk \
$(OUT_DIR)/rbc/make_vars_pre_product_config.mk) --makefile_list=$(OUT_DIR)/.module_paths/configuration.list \
$(current_product_makefile))
ifneq ($(.SHELLSTATUS),0) ifneq ($(.SHELLSTATUS),0)
$(error product configuration converter failed: $(.SHELLSTATUS)) $(error product configuration converter failed: $(.SHELLSTATUS))
endif endif
$(shell build/soong/scripts/update_out $(OUT_DIR)/rbc/rbc_product_config_results.mk \
$(OUT_DIR)/rbcrun RBC_OUT="make,global" $(OUT_DIR)/rbc/launcher.rbc)
ifneq ($(.SHELLSTATUS),0)
$(error product configuration runner failed: $(.SHELLSTATUS))
endif
include $(OUT_DIR)/rbc/rbc_product_config_results.mk include $(OUT_DIR)/rbc/rbc_product_config_results.mk
endif endif