From b50381684a619208bc1b0778f69add13c6a0c10a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 16 Mar 2016 12:35:33 -0700 Subject: Split Allow_missing_dependencies from Unbundled_build There are stripped down branches used to build other things than just unbundled apps (like the AOSP llvm branch used to build llvm prebuilts). Change-Id: Id772eac8c4622458591b52f9f27723fdb83f9a85 --- common/config.go | 2 +- common/variable.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/config.go b/common/config.go index ef59cf72..08129034 100644 --- a/common/config.go +++ b/common/config.go @@ -301,7 +301,7 @@ func (c *config) DefaultAppCertificate(ctx PathContext) SourcePath { } func (c *config) AllowMissingDependencies() bool { - return Bool(c.ProductVariables.Unbundled_build) + return Bool(c.ProductVariables.Allow_missing_dependencies) } func (c *config) SkipDeviceInstall() bool { diff --git a/common/variable.go b/common/variable.go index 04856e1a..350bfda5 100644 --- a/common/variable.go +++ b/common/variable.go @@ -73,9 +73,10 @@ type productVariables struct { CrossHostArch *string `json:",omitempty"` CrossHostSecondaryArch *string `json:",omitempty"` - Unbundled_build *bool `json:",omitempty"` - Brillo *bool `json:",omitempty"` - Malloc_not_svelte *bool `json:",omitempty"` + Allow_missing_dependencies *bool `json:",omitempty"` + Unbundled_build *bool `json:",omitempty"` + Brillo *bool `json:",omitempty"` + Malloc_not_svelte *bool `json:",omitempty"` } func boolPtr(v bool) *bool { -- cgit v1.2.3