From 42da69d78439ffaaa1ce857837e5123360bd2c22 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 22 Mar 2021 13:41:36 +0000 Subject: Add preparer for overlay pre-singleton registration It appears as though this is the first pre-singleton type to actually be registered with the InitRegistrationContext as it failed due to an uninitialized map, so this change also fixes that. Bug: 182885307 Test: m nothing Change-Id: Ibbf6d0db5f3c2fcc89291a16aa5f16b8b5009bd3 --- java/android_resources.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'java/android_resources.go') diff --git a/java/android_resources.go b/java/android_resources.go index 4d420cfed..6864ebb90 100644 --- a/java/android_resources.go +++ b/java/android_resources.go @@ -22,8 +22,11 @@ import ( ) func init() { - android.RegisterPreSingletonType("overlay", OverlaySingletonFactory) + registerOverlayBuildComponents(android.InitRegistrationContext) +} +func registerOverlayBuildComponents(ctx android.RegistrationContext) { + ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) } var androidResourceIgnoreFilenames = []string{ -- cgit v1.2.3-59-g8ed1b