Merge "Use a presingleton to create hiddenapi singleton paths early"

am: 17c85f098a

Change-Id: Ib94cff44bb21cd1dead01683b194bc6d8d7e20d6
This commit is contained in:
Colin Cross 2019-02-07 12:10:21 -08:00 committed by android-build-merger
commit a0e1404cf9

View file

@ -19,6 +19,7 @@ import (
)
func init() {
android.RegisterPreSingletonType("pre-hiddenapi", hiddenAPIPreSingletonFactory)
android.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory)
}
@ -43,6 +44,18 @@ func hiddenAPISingletonPaths(ctx android.PathContext) hiddenAPISingletonPathsStr
}).(hiddenAPISingletonPathsStruct)
}
func hiddenAPIPreSingletonFactory() android.Singleton {
return hiddenAPIPreSingleton{}
}
type hiddenAPIPreSingleton struct{}
// hiddenAPI pre-singleton rules to ensure paths are always generated before
// makevars
func (hiddenAPIPreSingleton) GenerateBuildActions(ctx android.SingletonContext) {
hiddenAPISingletonPaths(ctx)
}
func hiddenAPISingletonFactory() android.Singleton {
return hiddenAPISingleton{}
}