From 78d0254e9e0c71a9dd0cf8130156568497e4d990 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 4 May 2023 18:00:11 -0700 Subject: [PATCH] Inline rbc-run script 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 --- core/product_config.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/product_config.mk b/core/product_config.mk index 9db881f7e5..bf48539cd4 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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