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

Merge "Add RBC board configuration"

Browse Source
This commit is contained in:
Cole Faust
2021-10-05 00:49:48 +00:00
committed by Gerrit Code Review
parent 7fe5450be2 e5e7a2d531
commit 4de9bc79fb
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/board_config.mk
View File

@@ -184,7 +184,20 @@ else
.KATI_READONLY := TARGET_DEVICE_DIR .KATI_READONLY := TARGET_DEVICE_DIR
endif 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) 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))) ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE)))
$(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE) $(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE)

8
core/product_config.mk
View File

@@ -199,12 +199,8 @@ endif
ifndef RBC_PRODUCT_CONFIG ifndef RBC_PRODUCT_CONFIG
$(call import-products, $(current_product_makefile)) $(call import-products, $(current_product_makefile))
else else
rbcscript=build/soong/scripts/rbc-run rc := $(shell build/soong/scripts/rbc-run $(current_product_makefile) \
rc := $(shell $(rbcscript) $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) >$(OUT_DIR)/rbctemp.mk 2>$(OUT_DIR)/rbctemp.stderr || echo $$?) >$(OUT_DIR)/rbctemp.mk || echo $$?)
rbcerrors := $(file <$(OUT_DIR)/rbctemp.stderr)
ifneq (,$(rbcerrors))
$(warning $(rbcerrors))
endif
ifneq (,$(rc)) ifneq (,$(rc))
$(error product configuration converter failed: $(rc)) $(error product configuration converter failed: $(rc))
endif endif

2
core/product_config.rbc
View File

@@ -84,7 +84,7 @@ def _printvars(state):
print("SOONG_CONFIG_" + nsname, ":=", " ".join(nsvars.keys())) print("SOONG_CONFIG_" + nsname, ":=", " ".join(nsvars.keys()))
for var, val in sorted(nsvars.items()): for var, val in sorted(nsvars.items()):
__print_attr("SOONG_CONFIG_%s_%s" % (nsname, var), val) __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) __print_attr(attr, val)
def __printvars_rearrange_list(value_list): def __printvars_rearrange_list(value_list):