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

Revert "Reapply "Add support for product-specific build flags""

Browse Source 
Revert submission 2815850-product-flags

Reason for revert: b/309477343

Reverted changes: /q/submissionid:2815850-product-flags

Bug: 302593603
Bug: 309477343
Change-Id: I6294609d4c60973fceba567e37a6bc3b89239e42
This commit is contained in:
Colin Cross
2023-11-06 21:32:03 +00:00
parent 1acc860f83
commit 671bc15286
2 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -447,8 +447,6 @@ _product_list_vars += PRODUCT_AFDO_PROFILES
_product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API _product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API
_product_list_vars += PRODUCT_RELEASE_CONFIG_MAPS
_product_list_vars += PRODUCT_VALIDATION_CHECKS _product_list_vars += PRODUCT_VALIDATION_CHECKS
.KATI_READONLY := _product_single_value_vars _product_list_vars .KATI_READONLY := _product_single_value_vars _product_list_vars

52
core/release_config.mk
View File

@@ -52,15 +52,6 @@ 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 # $1 config name
# $2 release config files # $2 release config files
define declare-release-config define declare-release-config
@@ -72,24 +63,10 @@ define declare-release-config
$(eval _all_release_configs.$(strip $(1)).FILES := $(_all_release_configs.$(strip $(1)).FILES) $(strip $(2))) $(eval _all_release_configs.$(strip $(1)).FILES := $(_all_release_configs.$(strip $(1)).FILES) $(strip $(2)))
endef endef
# Include the config map files and populate _flag_declaration_files. # Include the config map files
_flag_declaration_files :=
$(foreach f, $(config_map_files), \ $(foreach f, $(config_map_files), \
$(eval FLAG_DECLARATION_FILES:= ) \
$(eval _included := $(f)) \ $(eval _included := $(f)) \
$(eval include $(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 # If TARGET_RELEASE is set, fail if there is no matching release config
@@ -101,11 +78,7 @@ ifeq ($(filter $(_all_release_configs), $(TARGET_RELEASE)),)
else else
# Choose flag files # Choose flag files
# Don't sort this, use it in the order they gave us. # Don't sort this, use it in the order they gave us.
# Do allow duplicate entries, retaining only the first usage. flag_value_files := $(_all_release_configs.$(TARGET_RELEASE).FILES)
flag_value_files :=
$(foreach f,$(_all_release_configs.$(TARGET_RELEASE).FILES), \
$(if $(filter $(f),$(flag_value_files)),,$(eval flag_value_files += $(f)))\
)
endif endif
else else
# Useful for finding scripts etc that aren't passing or setting TARGET_RELEASE # Useful for finding scripts etc that aren't passing or setting TARGET_RELEASE
@@ -148,8 +121,21 @@ config_map_files:=
# that we chose from the config map above. Then we run that, and load the # that we chose from the config map above. Then we run that, and load the
# results of that into the make environment. # results of that into the make environment.
# _flag_declaration_files is the combined list of FLAG_DECLARATION_FILES set by # If this is a google source tree, restrict it to only the one file
# release_config_map.mk files above. # 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) \
) \
)
# Because starlark can't find files with $(wildcard), write an entrypoint starlark script that # 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. # contains the result of the above wildcards for the starlark code to use.
@@ -159,8 +145,8 @@ _c+=$(newline)def add(d, k, v):
_c+=$(newline)$(space)d = dict(d) _c+=$(newline)$(space)d = dict(d)
_c+=$(newline)$(space)d[k] = v _c+=$(newline)$(space)d[k] = v
_c+=$(newline)$(space)return d _c+=$(newline)$(space)return d
_c+=$(foreach f,$(_flag_declaration_files),$(newline)load("$(f)", flags_$(call filename_to_starlark,$(f)) = "flags")) _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+=$(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+=$(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)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) _c+=$(newline)variables_to_export_to_make = release_config(all_flags, all_values)