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

Merge "Deliver all_release_configs.json as a build artifact" into main am: d9fe8f5a27

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3097723

Change-Id: I9010d16aebc8a60fa2d47c405745ea69bf07219f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-24 21:33:04 +00:00
committed by Automerger Merge Worker
parent 2389748ddb d9fe8f5a27
commit 0497847a43
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/release_config.mk
View File

@@ -130,7 +130,8 @@ ifneq (,$(_use_protobuf))
# Disable the build flag in release-config.
_args += --guard=false
endif
_flags_file:=$(OUT_DIR)/soong/release-config/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars
_flags_dir:=$(OUT_DIR)/soong/release-config
_flags_file:=$(_flags_dir)/release_config-$(TARGET_PRODUCT)-$(TARGET_RELEASE).vars
# release-config generates $(_flags_varmk)
_flags_varmk:=$(_flags_file:.vars=.varmk)
$(shell $(OUT_DIR)/release-config $(_args) >$(OUT_DIR)/release-config.out && touch -t 200001010000 $(_flags_varmk))
@@ -148,7 +149,21 @@ ifneq (,$(_use_protobuf))
_used_files :=
ifeq (,$(_must_protobuf)$(RELEASE_BUILD_FLAGS_IN_PROTOBUF))
_use_protobuf :=
else
_base_all_release := all_release_configs-$(TARGET_PRODUCT)
$(call dist-for-goals,droid,\
$(_flags_dir)/$(_base_all_release).pb:build_flags/all_release_configs.pb \
$(_flags_dir)/$(_base_all_release).textproto:build_flags/all_release_configs.textproto \
$(_flags_dir)/$(_base_all_release).json:build_flags/all_release_configs.json \
)
# These are always created, add an empty rule for them to keep ninja happy.
$(_flags_dir)/$(_base_all_release).pb $(_flags_dir)/$(_base_all_release).textproto $(_flags_dir)/$(_base_all_release).json:
: created by $(OUT_DIR)/release-config
_base_all_release :=
endif
_flags_dir:=
_flags_file:=
_flags_varmk:=
endif
ifeq (,$(_use_protobuf))
# The .mk files are the canonical source of truth.