diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-22 13:41:36 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-22 22:09:53 +0000 |
| commit | 42da69d78439ffaaa1ce857837e5123360bd2c22 (patch) | |
| tree | d4cd7e65fcacfa2d805e71fdd8da05d7c4e75cfa /java/java_test.go | |
| parent | 97d8b40fec62135fde2c3aa40d453a16c1f4eda8 (diff) | |
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
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 913ed8713..6bebf3729 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -71,11 +71,11 @@ var prepareForJavaTest = android.GroupFixturePreparers( cc.PrepareForTestWithCcBuildComponents, // Include all the default java modules. PrepareForTestWithJavaDefaultModules, + PrepareForTestWithOverlayBuildComponents, python.PrepareForTestWithPythonBuildComponents, android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { ctx.RegisterModuleType("java_plugin", PluginFactory) - ctx.RegisterPreSingletonType("overlay", OverlaySingletonFactory) ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), dexpreopt.PrepareForTestWithDexpreopt, |