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

Merge changes from topic "product-build-flags" into main

Browse Source 
* changes:
  release_config: build flags can be lists
  Add support for product-specific build flags
This commit is contained in:
LaMont Jones
2023-11-01 16:01:08 +00:00
committed by Gerrit Code Review
parent aea4c9d496 1dc07fa574
commit 752703251a
3 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -447,6 +447,8 @@ _product_list_vars += PRODUCT_AFDO_PROFILES
_product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API
_product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS
.KATI_READONLY := _product_single_value_vars _product_list_vars
_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

34
core/release_config.bzl
View File

@@ -55,6 +55,11 @@ _all_flags_schema = {
},
"declared_in": {"type": "string"},
},
"optional_keys": {
"appends": {
"type": "bool",
},
},
},
}
@@ -75,17 +80,23 @@ _all_values_schema = {
},
}
def flag(name, partitions, default):
def flag(name, partitions, default, _kwmarker = (), appends = False):
"""Declare a flag.
Args:
name: name of the flag
partitions: the partitions where this should be recorded.
default: the default value of the flag.
_kwmarker: Used to detect argument misuse.
appends: Whether new values should be append (not replace) the old.
Returns:
A dictionary containing the flag declaration.
"""
# If specified, appends must be a keyword value.
if _kwmarker != ():
fail("Too many positional parameters")
if not partitions:
fail("At least 1 partition is required")
if not name.startswith("RELEASE_"):
@@ -105,6 +116,7 @@ def flag(name, partitions, default):
"name": name,
"partitions": partitions,
"default": default,
"appends": appends,
}
def value(name, value):
@@ -153,10 +165,12 @@ def release_config(all_flags, all_values):
# Validate flags
flag_names = []
flags_dict = {}
for flag in all_flags:
if flag["name"] in flag_names:
fail(flag["declared_in"] + ": Duplicate declaration of flag " + flag["name"])
flag_names.append(flag["name"])
flags_dict[flag["name"]] = flag
# Record which flags go on which partition
partitions = {}
@@ -170,13 +184,21 @@ def release_config(all_flags, all_values):
else:
partitions.setdefault(partition, []).append(flag["name"])
# Validate values
# TODO(joeo): Disallow duplicate values after we've split AOSP and vendor flags.
# Generate final values.
# Only declared flags may have a value.
values = {}
for value in all_values:
if value["name"] not in flag_names:
fail(value["set_in"] + ": Value set for undeclared build flag: " + value["name"])
values[value["name"]] = value
name = value["name"]
if name not in flag_names:
fail(value["set_in"] + ": Value set for undeclared build flag: " + name)
if flags_dict[name]["appends"]:
if name in values:
values[name]["value"] += " " + value["value"]
values[name]["set_in"] += " " + value["set_in"]
else:
values[name] = value
else:
values[name] = value
# Collect values
result = {

52
core/release_config.mk
View File

@@ -52,6 +52,15 @@ config_map_files := $(wildcard build/release/release_config_map.mk) \
) \
)
# PRODUCT_RELEASE_CONFIG_MAPS is set by Soong using an initial run of product
# config to capture only the list of config maps needed by the build.
# Keep them in the order provided, but remove duplicates.
$(foreach map,$(PRODUCT_RELEASE_CONFIG_MAPS), \
$(if $(filter $(map),$(config_map_files)),,$(eval config_map_files += $(map))) \
)
# Declare or extend a release-config.
#
# $1 config name
# $2 release config files
define declare-release-config
@@ -63,10 +72,24 @@ define declare-release-config
$(eval _all_release_configs.$(strip $(1)).FILES := $(_all_release_configs.$(strip $(1)).FILES) $(strip $(2)))
endef
# Include the config map files
# Include the config map files and populate _flag_declaration_files.
_flag_declaration_files :=
$(foreach f, $(config_map_files), \
$(eval FLAG_DECLARATION_FILES:= ) \
$(eval _included := $(f)) \
$(eval include $(f)) \
$(eval _flag_declaration_files += $(FLAG_DECLARATION_FILES)) \
)
FLAG_DECLARATION_FILES :=
# Make sure that the flag definitions are included for vendor/google builds.
# This decouples the change in vendor/google/release/release_config_map.mk
# from this logic change.
# TODO: Remove this once the vendor/google FLAG_DECLARATION_FILES change is there.
$(if $(wildcard vendor/google/release/release_config_map.mk),\
$(if $(filter vendor/google/release/build_flags.bzl,$(_flag_declaration_files)),,\
$(eval _flag_declaration_files := vendor/google/release/build_flags.bzl $(_flag_declaration_files)) \
) \
)
# If TARGET_RELEASE is set, fail if there is no matching release config
@@ -78,7 +101,11 @@ ifeq ($(filter $(_all_release_configs), $(TARGET_RELEASE)),)
else
# Choose flag files
# Don't sort this, use it in the order they gave us.
flag_value_files := $(_all_release_configs.$(TARGET_RELEASE).FILES)
# Do allow duplicate entries, retaining only the first usage.
flag_value_files :=
$(foreach f,$(_all_release_configs.$(TARGET_RELEASE).FILES), \
$(if $(filter $(f),$(flag_value_files)),,$(eval flag_value_files += $(f)))\
)
endif
else
# Useful for finding scripts etc that aren't passing or setting TARGET_RELEASE
@@ -121,21 +148,8 @@ config_map_files:=
# that we chose from the config map above. Then we run that, and load the
# results of that into the make environment.
# If this is a google source tree, restrict it to only the one file
# which has OWNERS control. If it isn't let others define their own.
# TODO: Remove wildcard for build/release one when all branch manifests
# have updated.
flag_declaration_files := $(wildcard build/release/build_flags.bzl) \
$(if $(wildcard vendor/google/release/build_flags.bzl), \
vendor/google/release/build_flags.bzl, \
$(sort \
$(wildcard device/*/release/build_flags.bzl) \
$(wildcard device/*/*/release/build_flags.bzl) \
$(wildcard vendor/*/release/build_flags.bzl) \
$(wildcard vendor/*/*/release/build_flags.bzl) \
) \
)
# _flag_declaration_files is the combined list of FLAG_DECLARATION_FILES set by
# release_config_map.mk files above.
# Because starlark can't find files with $(wildcard), write an entrypoint starlark script that
# contains the result of the above wildcards for the starlark code to use.
@@ -145,8 +159,8 @@ _c+=$(newline)def add(d, k, v):
_c+=$(newline)$(space)d = dict(d)
_c+=$(newline)$(space)d[k] = v
_c+=$(newline)$(space)return d
_c+=$(foreach f,$(flag_declaration_files),$(newline)load("$(f)", flags_$(call filename_to_starlark,$(f)) = "flags"))
_c+=$(newline)all_flags = [] $(foreach f,$(flag_declaration_files),+ [add(x, "declared_in", "$(f)") for x in flags_$(call filename_to_starlark,$(f))])
_c+=$(foreach f,$(_flag_declaration_files),$(newline)load("$(f)", flags_$(call filename_to_starlark,$(f)) = "flags"))
_c+=$(newline)all_flags = [] $(foreach f,$(_flag_declaration_files),+ [add(x, "declared_in", "$(f)") for x in flags_$(call filename_to_starlark,$(f))])
_c+=$(foreach f,$(flag_value_files),$(newline)load("//$(f)", values_$(call filename_to_starlark,$(f)) = "values"))
_c+=$(newline)all_values = [] $(foreach f,$(flag_value_files),+ [add(x, "set_in", "$(f)") for x in values_$(call filename_to_starlark,$(f))])
_c+=$(newline)variables_to_export_to_make = release_config(all_flags, all_values)