Merge remote-tracking branch 'aosp/upstream' into master
* aosp/upstream:
Revert "Put the primary builder into the console pool"
Fix/improve comments on prepending/appending props
Fixes: 137593206
Test: m checkbuild
Change-Id: Ibed0bfa25cc26fd4382772e93ae6ddf07ab3d9fc
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
index c5d4899..3464c0b 100644
--- a/bootstrap/bootstrap.go
+++ b/bootstrap/bootstrap.go
@@ -130,7 +130,6 @@
Deps: blueprint.DepsGCC,
Depfile: "$out.d",
Restat: true,
- Pool: blueprint.Console,
},
"builder", "extra", "generator", "globFile")
diff --git a/proptools/extend.go b/proptools/extend.go
index f588ab2..b1a35d0 100644
--- a/proptools/extend.go
+++ b/proptools/extend.go
@@ -68,7 +68,7 @@
// *ExtendPropertyError, and can have the property name and error extracted from it.
//
// The append operation is defined as appending strings, and slices of strings normally, OR-ing bool
-// values, replacing non-nil pointers to booleans or strings, and recursing into
+// values, replacing pointers to booleans or strings whether they are nil or not, and recursing into
// embedded structs, pointers to structs, and interfaces containing
// pointers to structs. Appending the zero value of a property will always be a no-op.
func AppendMatchingProperties(dst []interface{}, src interface{},
@@ -89,7 +89,7 @@
// *ExtendPropertyError, and can have the property name and error extracted from it.
//
// The prepend operation is defined as prepending strings, and slices of strings normally, OR-ing
-// bool values, replacing non-nil pointers to booleans or strings, and recursing into
+// bool values, replacing nil pointers to booleans or strings, and recursing into
// embedded structs, pointers to structs, and interfaces containing
// pointers to structs. Prepending the zero value of a property will always be a no-op.
func PrependMatchingProperties(dst []interface{}, src interface{},
