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

Commit e5e7a2d5 authored by Cole Faust's avatar Cole Faust
Browse files

Add RBC board configuration 

This does largely the same thing as in product configuration,
it converts the board makefiles and evaluates them in place
of an $(include).

Bug: 201700692
Test: Temporarily replace the ifndef RBC_BOARD_CONFIG with RBC_PRODUCT_CONFIG,
      then ./build/bazel/ci/rbc_product_config.sh aosp_arm64-userdebug
Change-Id: I91c3dd6b91cf6bfeb18a5fff95d53b7a2c113c57
parent 894e9be3

core/board_config.mk

+13 −0
Original line number Diff line number Diff line
@@ -184,7 +184,20 @@ else 
  .KATI_READONLY := TARGET_DEVICE_DIR

endif



# TODO(colefaust) change this if to RBC_PRODUCT_CONFIG when

# the board configuration is known to work on everything

# the product config works on.

ifndef RBC_BOARD_CONFIG

include $(board_config_mk)

else

  rc := $(shell build/soong/scripts/rbc-run $(board_config_mk) \

      BUILDING_GSI=$(BUILDING_GSI) >$(OUT_DIR)/rbcboardtemp.mk || echo $$?)

  ifneq (,$(rc))

    $(error board configuration converter failed: $(rc))

  endif



  include $(OUT_DIR)/rbcboardtemp.mk

endif



ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE)))

  $(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE)

core/product_config.mk

+2 −6
Original line number Diff line number Diff line
@@ -199,12 +199,8 @@ endif 
ifndef RBC_PRODUCT_CONFIG

$(call import-products, $(current_product_makefile))

else

  rbcscript=build/soong/scripts/rbc-run

  rc := $(shell $(rbcscript) $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) >$(OUT_DIR)/rbctemp.mk 2>$(OUT_DIR)/rbctemp.stderr || echo $$?)

  rbcerrors := $(file <$(OUT_DIR)/rbctemp.stderr)

  ifneq (,$(rbcerrors))

    $(warning $(rbcerrors))

  endif

  rc := $(shell build/soong/scripts/rbc-run $(current_product_makefile) \

      >$(OUT_DIR)/rbctemp.mk || echo $$?)

  ifneq (,$(rc))

    $(error product configuration converter failed: $(rc))

  endif

core/product_config.rbc

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ def _printvars(state): 
                        print("SOONG_CONFIG_" + nsname, ":=", " ".join(nsvars.keys()))

                    for var, val in sorted(nsvars.items()):

                        __print_attr("SOONG_CONFIG_%s_%s" % (nsname, var), val)

            elif attr not in globals_base:

            elif attr not in globals_base or globals_base[attr] != val:

                __print_attr(attr, val)



def __printvars_rearrange_list(value_list):