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

Merge "Change aconfig dump to aconfig dump-cache" into main am: a514919521

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

Change-Id: I0a0107037ec1b1b2bc825a7a7cb223e8053c5d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-21 19:19:46 +00:00
committed by Automerger Merge Worker
parent 8d1a67806a a514919521
commit 0181efacf9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aconfig/init.go
View File

@@ -43,7 +43,7 @@ var (
// For create-device-config-sysprops: Generate aconfig flag value map text file // For create-device-config-sysprops: Generate aconfig flag value map text file
aconfigTextRule = pctx.AndroidStaticRule("aconfig_text", aconfigTextRule = pctx.AndroidStaticRule("aconfig_text",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${aconfig} dump --format='{fully_qualified_name}={state:bool}'` + Command: `${aconfig} dump-cache --format='{fully_qualified_name}={state:bool}'` +
` --cache ${in}` + ` --cache ${in}` +
` --out ${out}.tmp` + ` --out ${out}.tmp` +
` && ( if cmp -s ${out}.tmp ${out} ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`, ` && ( if cmp -s ${out}.tmp ${out} ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`,
@@ -56,7 +56,7 @@ var (
// For all_aconfig_declarations: Combine all parsed_flags proto files // For all_aconfig_declarations: Combine all parsed_flags proto files
AllDeclarationsRule = pctx.AndroidStaticRule("All_aconfig_declarations_dump", AllDeclarationsRule = pctx.AndroidStaticRule("All_aconfig_declarations_dump",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `${aconfig} dump --format protobuf --out ${out} ${cache_files}`, Command: `${aconfig} dump-cache --format protobuf --out ${out} ${cache_files}`,
CommandDeps: []string{ CommandDeps: []string{
"${aconfig}", "${aconfig}",
}, },
@@ -73,7 +73,7 @@ var (
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf ${out}.tmp` + Command: `rm -rf ${out}.tmp` +
`&& for cache in ${cache_files}; do ` + `&& for cache in ${cache_files}; do ` +
` if [ -n "$$(${aconfig} dump --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]; then ` + ` if [ -n "$$(${aconfig} dump-cache --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]; then ` +
` ${aconfig} create-java-lib --cache $$cache --mode=exported --out ${out}.tmp; ` + ` ${aconfig} create-java-lib --cache $$cache --mode=exported --out ${out}.tmp; ` +
` fi ` + ` fi ` +
`done` + `done` +