Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: Ie21f494b6c52952165babdcb26d4038f93ff0c0d
Merged-In: I2dbd6791675ed91303dc21d04992e600bb89f0ff
This commit is contained in:
Xin Li 2019-10-25 10:27:44 -07:00
commit 7ad7d5aac5
1 changed files with 4 additions and 4 deletions

View File

@ -195,6 +195,10 @@ func (p *Prebuilt) usePrebuilt(ctx TopDownMutatorContext, source Module) bool {
return source == nil || !source.Enabled()
}
func (p *Prebuilt) SourceExists() bool {
return p.properties.SourceExists
}
func (p *Prebuilt) checkSingleSourceProperties() {
if !p.srcProps.IsValid() || p.srcField.Name == "" {
panic(fmt.Errorf("invalid single source prebuilt %+v", p))
@ -215,7 +219,3 @@ func (p *Prebuilt) getSingleSourceFieldValue() string {
}
return value.String()
}
func (p *Prebuilt) SourceExists() bool {
return p.properties.SourceExists
}