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

Revert "Migrate buildinfo.sh script into Soong"

Browse Source 
Revert submission 3004875-buildinfo_prop_soong

Reason for revert: DroidMonitor-triggered revert due to breakage b/331462869

Reverted changes: /q/submissionid:3004875-buildinfo_prop_soong

Bug: 331462869
Change-Id: Ib8bbbad29a4ad7b800e6bd1a67a401c2225b78cb
This commit is contained in:
Gina Ko
2024-03-26 21:30:56 +00:00
parent 5baf2cbcb6
commit 465549b579
7 changed files with 89 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
android/buildinfo_prop.go
View File

@@ -54,39 +54,6 @@ func (p *buildinfoPropModule) OutputFiles(tag string) (Paths, error) {
return Paths{p.outputFilePath}, nil
}
func getBuildVariant(config Config) string {
if config.Eng() {
return "eng"
} else if config.Debuggable() {
return "userdebug"
} else {
return "user"
}
}
func getBuildFlavor(config Config) string {
buildFlavor := config.DeviceProduct() + "-" + getBuildVariant(config)
if InList("address", config.SanitizeDevice()) && !strings.Contains(buildFlavor, "_asan") {
buildFlavor += "_asan"
}
return buildFlavor
}
func shouldAddBuildThumbprint(config Config) bool {
knownOemProperties := []string{
"ro.product.brand",
"ro.product.name",
"ro.product.device",
}
for _, knownProp := range knownOemProperties {
if InList(knownProp, config.OemProperties()) {
return true
}
}
return false
}
func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
p.outputFilePath = PathForModuleOut(ctx, p.Name()).OutputPath
if !ctx.Config().KatiEnabled() {
@@ -94,66 +61,87 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
return
}
rule := NewRuleBuilder(pctx, ctx)
lines := make([]string, 0)
writeString := func(str string) {
lines = append(lines, str)
}
writeString("# begin build properties")
writeString("# autogenerated by build/soong/android/buildinfo_prop.go")
writeProp := func(key, value string) {
if strings.Contains(key, "=") {
panic(fmt.Errorf("wrong property key %q: key must not contain '='", key))
}
writeString(key + "=" + value)
}
config := ctx.Config()
buildVariant := getBuildVariant(config)
buildFlavor := getBuildFlavor(config)
cmd := rule.Command().BuiltTool("buildinfo")
writeProp("ro.build.version.sdk", config.PlatformSdkVersion().String())
writeProp("ro.build.version.preview_sdk", config.PlatformPreviewSdkVersion())
writeProp("ro.build.version.codename", config.PlatformSdkCodename())
writeProp("ro.build.version.all_codenames", strings.Join(config.PlatformVersionActiveCodenames(), ","))
writeProp("ro.build.version.release", config.PlatformVersionLastStable())
writeProp("ro.build.version.release_or_codename", config.PlatformVersionName())
writeProp("ro.build.version.security_patch", config.PlatformSecurityPatch())
writeProp("ro.build.version.base_os", config.PlatformBaseOS())
writeProp("ro.build.version.min_supported_target_sdk", config.PlatformMinSupportedTargetSdkVersion())
writeProp("ro.build.version.known_codenames", config.PlatformVersionKnownCodenames())
if config.BoardUseVbmetaDigestInFingerprint() {
cmd.Flag("--use-vbmeta-digest-in-fingerprint")
if config.Eng() {
writeProp("ro.build.type", "eng")
} else if config.Debuggable() {
writeProp("ro.build.type", "userdebug")
} else {
writeProp("ro.build.type", "user")
}
cmd.FlagWithArg("--build-flavor=", buildFlavor)
cmd.FlagWithInput("--build-hostname-file=", config.BuildHostnameFile(ctx))
cmd.FlagWithArg("--build-id=", config.BuildId())
cmd.FlagWithArg("--build-keys=", config.BuildKeys())
// Currently, only a few properties are implemented to unblock microdroid use case.
// TODO(b/189164487): support below properties as well and replace build/make/tools/buildinfo.sh
/*
if $BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT {
writeProp("ro.build.legacy.id", config.BuildID())
} else {
writeProp("ro.build.id", config.BuildId())
}
writeProp("ro.build.display.id", $BUILD_DISPLAY_ID)
writeProp("ro.build.version.incremental", $BUILD_NUMBER)
writeProp("ro.build.version.preview_sdk_fingerprint", $PLATFORM_PREVIEW_SDK_FINGERPRINT)
writeProp("ro.build.version.release_or_preview_display", $PLATFORM_DISPLAY_VERSION)
writeProp("ro.build.date", `$DATE`)
writeProp("ro.build.date.utc", `$DATE +%s`)
writeProp("ro.build.user", $BUILD_USERNAME)
writeProp("ro.build.host", $BUILD_HOSTNAME)
writeProp("ro.build.tags", $BUILD_VERSION_TAGS)
writeProp("ro.build.flavor", $TARGET_BUILD_FLAVOR)
// These values are deprecated, use "ro.product.cpu.abilist"
// instead (see below).
writeString("# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,")
writeString("# use ro.product.cpu.abilist instead.")
writeProp("ro.product.cpu.abi", $TARGET_CPU_ABI)
if [ -n "$TARGET_CPU_ABI2" ] {
writeProp("ro.product.cpu.abi2", $TARGET_CPU_ABI2)
}
// shouldn't depend on BuildNumberFile and BuildThumbprintFile to prevent from rebuilding
// on every incremental build.
cmd.FlagWithArg("--build-number-file=", config.BuildNumberFile(ctx).String())
if shouldAddBuildThumbprint(config) {
cmd.FlagWithArg("--build-thumbprint-file=", config.BuildThumbprintFile(ctx).String())
}
if [ -n "$PRODUCT_DEFAULT_LOCALE" ] {
writeProp("ro.product.locale", $PRODUCT_DEFAULT_LOCALE)
}
writeProp("ro.wifi.channels", $PRODUCT_DEFAULT_WIFI_CHANNELS)
writeString("# ro.build.product is obsolete; use ro.product.device")
writeProp("ro.build.product", $TARGET_DEVICE)
cmd.FlagWithArg("--build-type=", config.BuildType())
cmd.FlagWithArg("--build-username=", config.Getenv("BUILD_USERNAME"))
cmd.FlagWithArg("--build-variant=", buildVariant)
cmd.FlagForEachArg("--cpu-abis=", config.DeviceAbi())
writeString("# Do not try to parse description or thumbprint")
writeProp("ro.build.description", $PRIVATE_BUILD_DESC)
if [ -n "$BUILD_THUMBPRINT" ] {
writeProp("ro.build.thumbprint", $BUILD_THUMBPRINT)
}
*/
// shouldn't depend on BUILD_DATETIME_FILE to prevent from rebuilding on every incremental
// build.
cmd.FlagWithArg("--date-file=", ctx.Config().Getenv("BUILD_DATETIME_FILE"))
writeString("# end build properties")
if len(config.ProductLocales()) > 0 {
cmd.FlagWithArg("--default-locale=", config.ProductLocales()[0])
}
cmd.FlagForEachArg("--default-wifi-channels=", config.ProductDefaultWifiChannels())
cmd.FlagWithArg("--device=", config.DeviceName())
if config.DisplayBuildNumber() {
cmd.Flag("--display-build-number")
}
cmd.FlagWithArg("--platform-base-os=", config.PlatformBaseOS())
cmd.FlagWithArg("--platform-display-version=", config.PlatformDisplayVersionName())
cmd.FlagWithArg("--platform-min-supported-target-sdk-version=", config.PlatformMinSupportedTargetSdkVersion())
cmd.FlagWithInput("--platform-preview-sdk-fingerprint-file=", ApiFingerprintPath(ctx))
cmd.FlagWithArg("--platform-preview-sdk-version=", config.PlatformPreviewSdkVersion())
cmd.FlagWithArg("--platform-sdk-version=", config.PlatformSdkVersion().String())
cmd.FlagWithArg("--platform-security-patch=", config.PlatformSecurityPatch())
cmd.FlagWithArg("--platform-version=", config.PlatformVersionName())
cmd.FlagWithArg("--platform-version-codename=", config.PlatformSdkCodename())
cmd.FlagForEachArg("--platform-version-all-codenames=", config.PlatformVersionActiveCodenames())
cmd.FlagWithArg("--platform-version-known-codenames=", config.PlatformVersionKnownCodenames())
cmd.FlagWithArg("--platform-version-last-stable=", config.PlatformVersionLastStable())
cmd.FlagWithArg("--product=", config.DeviceProduct())
cmd.FlagWithOutput("--out=", p.outputFilePath)
rule.Build(ctx.ModuleName(), "generating buildinfo props")
WriteFileRule(ctx, p.outputFilePath, strings.Join(lines, "\n"))
if !p.installable() {
p.SkipInstall()