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

Merge "aconfig/init.go: fix copy and paste mistakes" into main am: 4ce715f591

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

Change-Id: Ie3ff7974064d42c877cfc5e4ab242c8cd369c883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-20 20:21:21 +00:00
committed by Automerger Merge Worker
parent 206329779d 4ce715f591
commit e0682796af
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
aconfig/init.go
View File

@@ -40,7 +40,7 @@ var (
Restat: true, Restat: true,
}, "release_version", "package", "declarations", "values", "default-permission") }, "release_version", "package", "declarations", "values", "default-permission")
// For java_aconfig_library: Generate java file // For java_aconfig_library: Generate java library
javaRule = pctx.AndroidStaticRule("java_aconfig_library", javaRule = pctx.AndroidStaticRule("java_aconfig_library",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf ${out}.tmp` + Command: `rm -rf ${out}.tmp` +
@@ -58,7 +58,7 @@ var (
Restat: true, Restat: true,
}, "mode") }, "mode")
// For java_aconfig_library: Generate java file // For cc_aconfig_library: Generate C++ library
cppRule = pctx.AndroidStaticRule("cc_aconfig_library", cppRule = pctx.AndroidStaticRule("cc_aconfig_library",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf ${gendir}` + Command: `rm -rf ${gendir}` +
@@ -69,10 +69,10 @@ var (
` --out ${gendir}`, ` --out ${gendir}`,
CommandDeps: []string{ CommandDeps: []string{
"$aconfig", "$aconfig",
"$soong_zip",
}, },
}, "gendir", "mode") }, "gendir", "mode")
// For rust_aconfig_library: Generate Rust library
rustRule = pctx.AndroidStaticRule("rust_aconfig_library", rustRule = pctx.AndroidStaticRule("rust_aconfig_library",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf ${gendir}` + Command: `rm -rf ${gendir}` +
@@ -83,11 +83,10 @@ var (
` --out ${gendir}`, ` --out ${gendir}`,
CommandDeps: []string{ CommandDeps: []string{
"$aconfig", "$aconfig",
"$soong_zip",
}, },
}, "gendir", "mode") }, "gendir", "mode")
// For all_aconfig_declarations // 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 --format protobuf --out ${out} ${cache_files}`,