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

Disable protobuf deterministic randomness in soong_build am: 66213a64b2

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

Change-Id: I4fb3329f5190111d840860eafe83b5d64f0b848e
This commit is contained in:
Dan Willemsen
2021-09-23 02:07:37 +00:00
committed by Automerger Merge Worker
parent e8273d7bb0 66213a64b2
commit 37c59d4351
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/soong_build/Android.bp
View File

@@ -22,6 +22,7 @@ blueprint_go_binary {
"blueprint", "blueprint",
"blueprint-bootstrap", "blueprint-bootstrap",
"golang-protobuf-proto", "golang-protobuf-proto",
"golang-protobuf-android",
"soong", "soong",
"soong-android", "soong-android",
"soong-bp2build", "soong-bp2build",

10
cmd/soong_build/main.go
View File

@@ -23,14 +23,14 @@ import (
"strings" "strings"
"time" "time"
"android/soong/android"
"android/soong/bp2build" "android/soong/bp2build"
"android/soong/shared" "android/soong/shared"
"github.com/google/blueprint/bootstrap" "github.com/google/blueprint/bootstrap"
"github.com/google/blueprint/deptools" "github.com/google/blueprint/deptools"
"github.com/google/blueprint/pathtools" "github.com/google/blueprint/pathtools"
androidProtobuf "google.golang.org/protobuf/android"
"android/soong/android"
) )
var ( var (
@@ -85,6 +85,12 @@ func init() {
// Flags that probably shouldn't be flags of soong_build but we haven't found // Flags that probably shouldn't be flags of soong_build but we haven't found
// the time to remove them yet // the time to remove them yet
flag.BoolVar(&runGoTests, "t", false, "build and run go tests during bootstrap") flag.BoolVar(&runGoTests, "t", false, "build and run go tests during bootstrap")
// Disable deterministic randomization in the protobuf package, so incremental
// builds with unrelated Soong changes don't trigger large rebuilds (since we
// write out text protos in command lines, and command line changes trigger
// rebuilds).
androidProtobuf.DisableRand()
} }
func newNameResolver(config android.Config) *android.NameResolver { func newNameResolver(config android.Config) *android.NameResolver {