diff options
| author | Colin Cross <ccross@android.com> | 2023-12-05 16:39:20 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2023-12-05 16:39:20 -0800 |
| commit | 706b0c3ddb43b7c842cb066c1958e17b4a7c3664 (patch) | |
| tree | 8020ce0eb6f52f795091cc948269155424950438 | |
| parent | 952df85c69c65943acf3962e5edf24c2a060ed5c (diff) | |
| download | build-706b0c3ddb43b7c842cb066c1958e17b4a7c3664.tar.gz | |
Add --dedup flag to generate-partition-aconfig-flag-file
When Soong creates per-module aconfig files by merging aconfig files
from dependencies $(sort) is no longer sufficient to dedup identical
flags. Pass --dedup to aconfig dump.
Fixes: 313698230
Test: m out/target/product/vsoc_x86_64/system/etc/aconfig_flags.pb
Change-Id: Icd8a3fbff8fe0be1dbb617ac1db4bd73f35b2d2f
| -rw-r--r-- | core/packaging/flags.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/packaging/flags.mk b/core/packaging/flags.mk index a7e8d358e8..57df911dc1 100644 --- a/core/packaging/flags.mk +++ b/core/packaging/flags.mk @@ -78,7 +78,7 @@ $(eval $(strip $(1)): PRIVATE_IN := $(strip $(3))) $(strip $(1)): $(ACONFIG) $(strip $(3)) mkdir -p $$(dir $$(PRIVATE_OUT)) $$(if $$(PRIVATE_IN), \ - $$(ACONFIG) dump --format protobuf --out $$(PRIVATE_OUT) \ + $$(ACONFIG) dump --dedup --format protobuf --out $$(PRIVATE_OUT) \ $$(addprefix --cache ,$$(PRIVATE_IN)), \ echo -n > $$(PRIVATE_OUT) \ ) |