Merge "Add dependency for combined aconfig files" into main am: a3cd7dcd29 am: 84b3f07b31 am: a2429cece4 am: 897ff17e3d

Original change: https://android-review.googlesource.com/c/platform/build/+/2717642

Change-Id: Ib748fc0046bb19c127db37f670f2712398cad5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-21 15:55:35 +00:00 committed by Automerger Merge Worker
commit 88a856eb02

View file

@ -75,7 +75,7 @@ $(foreach partition, $(_FLAG_PARTITIONS), \
define generate-partition-aconfig-flag-file
$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))
$(eval $(strip $(1)): PRIVATE_IN := $(strip $(3)))
$(strip $(1)): $(ACONFIG)
$(strip $(1)): $(ACONFIG) $(strip $(3))
mkdir -p $$(dir $$(PRIVATE_OUT))
$$(if $$(PRIVATE_IN), \
$$(ACONFIG) dump --format textproto --out $$(PRIVATE_OUT) \