commit 4eb4b41cefa6310cfebe9dfd2f07abc3d7e25c0d
author Paul Duffin <paulduffin@google.com> Tue Mar 09 02:59:25 2021 +0000
committer Paul Duffin <paulduffin@google.com> Mon Mar 15 19:56:38 2021 +0000
tree 8c0ac1d531fcd9d0adfc52a9a13505aa4a526878
parent 05f72de0837021c7f80133e22392a1a238b1c56f

Provide preparer for using platform_compat_config modules

Bug: 181070625
Test: m nothing
Change-Id: I92ec022fae0951a21c2e885d3ded7c98daacfcfc

java/platform_compat_config.go

diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go
index 2c47b0a..218154e 100644
--- a/java/platform_compat_config.go
+++ b/java/platform_compat_config.go
@@ -20,11 +20,17 @@
 )
 
 func init() {
-	android.RegisterSingletonType("platform_compat_config_singleton", platformCompatConfigSingletonFactory)
-	android.RegisterModuleType("platform_compat_config", PlatformCompatConfigFactory)
-	android.RegisterModuleType("global_compat_config", globalCompatConfigFactory)
+	registerPlatformCompatConfigBuildComponents(android.InitRegistrationContext)
 }
 
+func registerPlatformCompatConfigBuildComponents(ctx android.RegistrationContext) {
+	ctx.RegisterSingletonType("platform_compat_config_singleton", platformCompatConfigSingletonFactory)
+	ctx.RegisterModuleType("platform_compat_config", PlatformCompatConfigFactory)
+	ctx.RegisterModuleType("global_compat_config", globalCompatConfigFactory)
+}
+
+var PrepareForTestWithPlatformCompatConfig = android.FixtureRegisterWithContext(registerPlatformCompatConfigBuildComponents)
+
 func platformCompatConfigPath(ctx android.PathContext) android.OutputPath {
 	return android.PathForOutput(ctx, "compat_config", "merged_compat_config.xml")
 }