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

Merge changes from topic "soong_build_number_file" am: f14cd86e23

Browse Source 
Change-Id: I5dd8a75a637b6d1070d1883733ba6623532d258d
This commit is contained in:
Automerger Merge Worker
2020-02-28 20:32:28 +00:00
parent ecd9330b33 f14cd86e23
commit 5e1f7bf09b
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -570,8 +570,8 @@ func (c *config) BuildId() string {
return String(c.productVariables.BuildId) return String(c.productVariables.BuildId)
} }
func (c *config) BuildNumberFromFile() string { func (c *config) BuildNumberFile(ctx PathContext) Path {
return String(c.productVariables.BuildNumberFromFile) return PathForOutput(ctx, String(c.productVariables.BuildNumberFile))
} }
// DeviceName returns the name of the current device target // DeviceName returns the name of the current device target

5
android/variable.go
View File

@@ -141,8 +141,7 @@ type productVariables struct {
Make_suffix *string `json:",omitempty"` Make_suffix *string `json:",omitempty"`
BuildId *string `json:",omitempty"` BuildId *string `json:",omitempty"`
BuildNumberFromFile *string `json:",omitempty"` BuildNumberFile *string `json:",omitempty"`
DateFromFile *string `json:",omitempty"`
Platform_version_name *string `json:",omitempty"` Platform_version_name *string `json:",omitempty"`
Platform_sdk_version *int `json:",omitempty"` Platform_sdk_version *int `json:",omitempty"`
@@ -345,7 +344,7 @@ func stringPtr(v string) *string {
func (v *productVariables) SetDefaultConfig() { func (v *productVariables) SetDefaultConfig() {
*v = productVariables{ *v = productVariables{
BuildNumberFromFile: stringPtr("123456789"), BuildNumberFile: stringPtr("build_number.txt"),
Platform_version_name: stringPtr("Q"), Platform_version_name: stringPtr("Q"),
Platform_sdk_version: intPtr(28), Platform_sdk_version: intPtr(28),

8
cc/linker.go
View File

@@ -501,19 +501,21 @@ func init() {
var injectVersionSymbol = pctx.AndroidStaticRule("injectVersionSymbol", var injectVersionSymbol = pctx.AndroidStaticRule("injectVersionSymbol",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$symbolInjectCmd -i $in -o $out -s soong_build_number " + Command: "$symbolInjectCmd -i $in -o $out -s soong_build_number " +
"-from 'SOONG BUILD NUMBER PLACEHOLDER' -v $buildNumberFromFile", "-from 'SOONG BUILD NUMBER PLACEHOLDER' -v $$(cat $buildNumberFile)",
CommandDeps: []string{"$symbolInjectCmd"}, CommandDeps: []string{"$symbolInjectCmd"},
}, },
"buildNumberFromFile") "buildNumberFile")
func (linker *baseLinker) injectVersionSymbol(ctx ModuleContext, in android.Path, out android.WritablePath) { func (linker *baseLinker) injectVersionSymbol(ctx ModuleContext, in android.Path, out android.WritablePath) {
buildNumberFile := ctx.Config().BuildNumberFile(ctx)
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: injectVersionSymbol, Rule: injectVersionSymbol,
Description: "inject version symbol", Description: "inject version symbol",
Input: in, Input: in,
Output: out, Output: out,
OrderOnly: android.Paths{buildNumberFile},
Args: map[string]string{ Args: map[string]string{
"buildNumberFromFile": proptools.NinjaEscape(ctx.Config().BuildNumberFromFile()), "buildNumberFile": buildNumberFile.String(),
}, },
}) })
} }

3
java/droiddoc.go
View File

@@ -773,6 +773,7 @@ func (d *Droiddoc) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, docletPath classpath) { func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.RuleBuilderCommand, docletPath classpath) {
buildNumberFile := ctx.Config().BuildNumberFile(ctx)
// Droiddoc always gets "-source 1.8" because it doesn't support 1.9 sources. For modules with 1.9 // Droiddoc always gets "-source 1.8" because it doesn't support 1.9 sources. For modules with 1.9
// sources, droiddoc will get sources produced by metalava which will have already stripped out the // sources, droiddoc will get sources produced by metalava which will have already stripped out the
// 1.9 language features. // 1.9 language features.
@@ -782,7 +783,7 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule
Flag("-XDignore.symbol.file"). Flag("-XDignore.symbol.file").
FlagWithArg("-doclet ", "com.google.doclava.Doclava"). FlagWithArg("-doclet ", "com.google.doclava.Doclava").
FlagWithInputList("-docletpath ", docletPath.Paths(), ":"). FlagWithInputList("-docletpath ", docletPath.Paths(), ":").
FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-"+ctx.Config().BuildNumberFromFile()). FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-$(cat "+buildNumberFile.String()+")").OrderOnly(buildNumberFile).
FlagWithArg("-hdf page.now ", `"$(date -d @$(cat `+ctx.Config().Getenv("BUILD_DATETIME_FILE")+`) "+%d %b %Y %k:%M")" `) FlagWithArg("-hdf page.now ", `"$(date -d @$(cat `+ctx.Config().Getenv("BUILD_DATETIME_FILE")+`) "+%d %b %Y %k:%M")" `)
if String(d.properties.Custom_template) == "" { if String(d.properties.Custom_template) == "" {