openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2019-02-07 14:27:35 -08:00
parent 65494b962b
commit 697412f058
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
java/hiddenapi_singleton.go
View File

@ -19,7 +19,6 @@ import (
) )
func init() { func init() {
android.RegisterPreSingletonType("pre-hiddenapi", hiddenAPIPreSingletonFactory)
android.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory) android.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory)
} }
@ -44,18 +43,6 @@ func hiddenAPISingletonPaths(ctx android.PathContext) hiddenAPISingletonPathsStr
}).(hiddenAPISingletonPathsStruct) }).(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 { func hiddenAPISingletonFactory() android.Singleton {
return hiddenAPISingleton{} return hiddenAPISingleton{}
} }
@ -296,7 +283,7 @@ func init() {
// Both paths are used to call dist-for-goals. // Both paths are used to call dist-for-goals.
func hiddenAPIMakeVars(ctx android.MakeVarsContext) { func hiddenAPIMakeVars(ctx android.MakeVarsContext) {
if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { 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_FLAGS", singletonPaths.flags.String())
ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA", singletonPaths.metadata.String()) ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA", singletonPaths.metadata.String())
} }