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

Merge "Inline rbc-run script" am: 6b78461d48 am: 47b0388e1a am: 49d0e356e1 am: e5cfc05e88

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

Change-Id: I5a337da79a1716782ae1a9a01c73a6c69c8b16d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-05 23:22:17 +00:00
committed by Automerger Merge Worker
parent ac30fe55d2 e5cfc05e88
commit e94f77d861
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)
$(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_product_config.mk)
$(shell build/soong/scripts/update_out \
$(OUT_DIR)/rbc/rbc_product_config_results.mk \
build/soong/scripts/rbc-run \
$(current_product_makefile) \
$(OUT_DIR)/rbc/make_vars_pre_product_config.mk)
$(shell $(OUT_DIR)/mk2rbc \
--mode=write -r --outdir $(OUT_DIR)/rbc \
--launcher=$(OUT_DIR)/rbc/launcher.rbc \
--input_variables=$(OUT_DIR)/rbc/make_vars_pre_product_config.mk \
--makefile_list=$(OUT_DIR)/.module_paths/configuration.list \
$(current_product_makefile))
ifneq ($(.SHELLSTATUS),0)
$(error product configuration converter failed: $(.SHELLSTATUS))
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
endif