Update paths to mk2rbc/rbcrun
They're now directly under the out folder instead
of out/soong.
Bug: 226677850
Test: Manually
Change-Id: I6f2d017736323a5a60b0a8d7face723862c0b0b3
diff --git a/core/board_config.mk b/core/board_config.mk
index 5ca2a4c..72a8044 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -243,7 +243,7 @@
$(shell mkdir -p $(OUT_DIR)/rbc)
$(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_board_config.mk)
- $(shell $(OUT_DIR)/soong/mk2rbc \
+ $(shell $(OUT_DIR)/mk2rbc \
--mode=write -r --outdir $(OUT_DIR)/rbc \
--boardlauncher=$(OUT_DIR)/rbc/boardlauncher.rbc \
--input_variables=$(OUT_DIR)/rbc/make_vars_pre_board_config.mk \
@@ -254,7 +254,7 @@
endif
$(shell build/soong/scripts/update_out $(OUT_DIR)/rbc/rbc_board_config_results.mk \
- $(OUT_DIR)/soong/rbcrun RBC_OUT="make,global" $(OUT_DIR)/rbc/boardlauncher.rbc)
+ $(OUT_DIR)/rbcrun RBC_OUT="make,global" $(OUT_DIR)/rbc/boardlauncher.rbc)
ifneq ($(.SHELLSTATUS),0)
$(error board configuration runner failed: $(.SHELLSTATUS))
endif