Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d0254e authored by Cole Faust's avatar Cole Faust
Browse files

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
parent 51e1e93a

core/product_config.mk

+13 −5
Original line number Diff line number Diff line
@@ -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