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

Merge "Include all_aconfig_declarations in sdk dist" into main

Browse Source
This commit is contained in:
Mårten Kongstad
2024-02-20 20:27:37 +00:00
committed by Gerrit Code Review
parent 431f004e59 2a1adcc63a
commit cbc967ffc2
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
aconfig/all_aconfig_declarations.go
View File

@@ -31,7 +31,8 @@ func AllAconfigDeclarationsFactory() android.Singleton {
} }
type allAconfigDeclarationsSingleton struct { type allAconfigDeclarationsSingleton struct {
intermediatePath android.OutputPath intermediateBinaryProtoPath android.OutputPath
intermediateTextProtoPath android.OutputPath
} }
func (this *allAconfigDeclarationsSingleton) GenerateBuildActions(ctx android.SingletonContext) { func (this *allAconfigDeclarationsSingleton) GenerateBuildActions(ctx android.SingletonContext) {
@@ -59,20 +60,35 @@ func (this *allAconfigDeclarationsSingleton) GenerateBuildActions(ctx android.Si
panic(fmt.Errorf("Only one aconfig_declarations allowed for each package.")) panic(fmt.Errorf("Only one aconfig_declarations allowed for each package."))
} }
// Generate build action for aconfig // Generate build action for aconfig (binary proto output)
this.intermediatePath = android.PathForIntermediates(ctx, "all_aconfig_declarations.pb") this.intermediateBinaryProtoPath = android.PathForIntermediates(ctx, "all_aconfig_declarations.pb")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: AllDeclarationsRule, Rule: AllDeclarationsRule,
Inputs: cacheFiles, Inputs: cacheFiles,
Output: this.intermediatePath, Output: this.intermediateBinaryProtoPath,
Description: "all_aconfig_declarations", Description: "all_aconfig_declarations",
Args: map[string]string{ Args: map[string]string{
"cache_files": android.JoinPathsWithPrefix(cacheFiles, "--cache "), "cache_files": android.JoinPathsWithPrefix(cacheFiles, "--cache "),
}, },
}) })
ctx.Phony("all_aconfig_declarations", this.intermediatePath) ctx.Phony("all_aconfig_declarations", this.intermediateBinaryProtoPath)
// Generate build action for aconfig (text proto output)
this.intermediateTextProtoPath = android.PathForIntermediates(ctx, "all_aconfig_declarations.textproto")
ctx.Build(pctx, android.BuildParams{
Rule: AllDeclarationsRuleTextProto,
Inputs: cacheFiles,
Output: this.intermediateTextProtoPath,
Description: "all_aconfig_declarations_textproto",
Args: map[string]string{
"cache_files": android.JoinPathsWithPrefix(cacheFiles, "--cache "),
},
})
ctx.Phony("all_aconfig_declarations_textproto", this.intermediateTextProtoPath)
} }
func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) { func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) {
ctx.DistForGoal("droid", this.intermediatePath) ctx.DistForGoal("droid", this.intermediateBinaryProtoPath)
ctx.DistForGoalWithFilename("sdk", this.intermediateBinaryProtoPath, "flags.pb")
ctx.DistForGoalWithFilename("sdk", this.intermediateTextProtoPath, "flags.textproto")
} }

7
aconfig/init.go
View File

@@ -75,6 +75,13 @@ var (
"${aconfig}", "${aconfig}",
}, },
}, "cache_files") }, "cache_files")
AllDeclarationsRuleTextProto = pctx.AndroidStaticRule("All_aconfig_declarations_dump_textproto",
blueprint.RuleParams{
Command: `${aconfig} dump-cache --dedup --format textproto --out ${out} ${cache_files}`,
CommandDeps: []string{
"${aconfig}",
},
}, "cache_files")
// For exported_java_aconfig_library: Generate a JAR from all // For exported_java_aconfig_library: Generate a JAR from all
// java_aconfig_libraries to be consumed by apps built outside the // java_aconfig_libraries to be consumed by apps built outside the