Merge "xz: force use of the prebuilt."

am: 945c72660d

Change-Id: Ia707ca3df0fe46e6e0305f56aa9a349c6afa0594
This commit is contained in:
Elliott Hughes 2019-05-02 14:46:40 -07:00 committed by android-build-merger
commit 3e0a335c89

View file

@ -74,8 +74,10 @@ func GetConfig(name string) PathConfig {
}
var Configuration = map[string]PathConfig{
"bash": Allowed,
"bc": Allowed,
"bash": Allowed,
"bc": Allowed,
// We need bzip2 here even though we provide a bzip2 binary because
// GNU tar seems to avoid calling ours.
"bzip2": Allowed,
"date": Allowed,
"dd": Allowed,
@ -104,7 +106,6 @@ var Configuration = map[string]PathConfig{
"timeout": Allowed,
"tr": Allowed,
"unzip": Allowed,
"xz": Allowed,
"zip": Allowed,
"zipinfo": Allowed,