Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f4fc9e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "parallel-singletons" am: 47514686 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2593067



Change-Id: If64f8f4e8d77bcc07e51c214c766656736a406d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bef24e82 47514686

android/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ func init() { 
}



func RegisterAndroidMkBuildComponents(ctx RegistrationContext) {

	ctx.RegisterSingletonType("androidmk", AndroidMkSingleton)

	ctx.RegisterParallelSingletonType("androidmk", AndroidMkSingleton)

}



// Enable androidmk support.

android/api_levels.go

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import ( 
)



func init() {

	RegisterSingletonType("api_levels", ApiLevelsSingleton)

	RegisterParallelSingletonType("api_levels", ApiLevelsSingleton)

}



const previewAPILevelBase = 9000

android/buildinfo_prop.go

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import ( 


func init() {

	ctx := InitRegistrationContext

	ctx.RegisterSingletonModuleType("buildinfo_prop", buildinfoPropFactory)

	ctx.RegisterParallelSingletonModuleType("buildinfo_prop", buildinfoPropFactory)

}



type buildinfoPropProperties struct {

android/gen_notice.go

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ func init() { 


// Register the gen_notice module type.

func RegisterGenNoticeBuildComponents(ctx RegistrationContext) {

	ctx.RegisterSingletonType("gen_notice_build_rules", GenNoticeBuildRulesFactory)

	ctx.RegisterParallelSingletonType("gen_notice_build_rules", GenNoticeBuildRulesFactory)

	ctx.RegisterModuleType("gen_notice", GenNoticeFactory)

}

android/metrics.go

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ func readSoongMetrics(config Config) (SoongMetrics, bool) { 
}



func init() {

	RegisterSingletonType("soong_metrics", soongMetricsSingletonFactory)

	RegisterParallelSingletonType("soong_metrics", soongMetricsSingletonFactory)

}



func soongMetricsSingletonFactory() Singleton { return soongMetricsSingleton{} }