Remove the hiddenapi presingleton
The presingleton is no longer necessary now that MakeVarsContext
is a PathContext, just call hiddenAPISingletonPaths directly.
Test: m checkbuild
Test: forrest build of unbundled branch
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index d43e276..de1bcf5 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -19,7 +19,6 @@
)
func init() {
- android.RegisterPreSingletonType("pre-hiddenapi", hiddenAPIPreSingletonFactory)
android.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory)
}
@@ -44,18 +43,6 @@
}).(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{}
}
@@ -296,7 +283,7 @@
// Both paths are used to call dist-for-goals.
func hiddenAPIMakeVars(ctx android.MakeVarsContext) {
if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {
- singletonPaths := ctx.Config().Get(hiddenAPISingletonPathsKey).(hiddenAPISingletonPathsStruct)
+ singletonPaths := hiddenAPISingletonPaths(ctx)
ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_FLAGS", singletonPaths.flags.String())
ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA", singletonPaths.metadata.String())
}