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

Merge "apex_available is defaultable"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-06 04:23:37 +00:00
committed by Gerrit Code Review
parent 1fdb0b55a5 3814f4df2b
commit cea93afe76
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/defaults.go
View File

@@ -151,7 +151,8 @@ func InitDefaultsModule(module DefaultsModule) {
module.AddProperties( module.AddProperties(
&hostAndDeviceProperties{}, &hostAndDeviceProperties{},
commonProperties, commonProperties,
&variableProperties{}) &variableProperties{},
&ApexProperties{})
InitArchModule(module) InitArchModule(module)
InitDefaultableModule(module) InitDefaultableModule(module)

4
apex/apex.go
View File

@@ -1157,12 +1157,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}) })
// check apex_available requirements // check apex_available requirements
if !ctx.Host() { if !ctx.Host() && !a.testApex {
for _, fi := range filesInfo { for _, fi := range filesInfo {
if am, ok := fi.module.(android.ApexModule); ok { if am, ok := fi.module.(android.ApexModule); ok {
if !am.AvailableFor(ctx.ModuleName()) { if !am.AvailableFor(ctx.ModuleName()) {
ctx.ModuleErrorf("requires %q that is not available for the APEX", fi.module.Name()) ctx.ModuleErrorf("requires %q that is not available for the APEX", fi.module.Name())
return // don't stop so that we can report other violations in the same run
} }
} }
} }

1
cc/cc.go
View File

@@ -2459,7 +2459,6 @@ func DefaultsFactory(props ...interface{}) android.Module {
&PgoProperties{}, &PgoProperties{},
&XomProperties{}, &XomProperties{},
&android.ProtoProperties{}, &android.ProtoProperties{},
&android.ApexProperties{},
) )
android.InitDefaultsModule(module) android.InitDefaultsModule(module)