diff --git a/apex/apex.go b/apex/apex.go index 0445c205e..fdfcf8628 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -136,7 +136,7 @@ func init() { pctx.HostBinToolVariable("zip2zip", "zip2zip") pctx.HostBinToolVariable("zipalign", "zipalign") - android.RegisterModuleType("apex", apexBundleFactory) + android.RegisterModuleType("apex", ApexBundleFactory) android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.TopDown("apex_deps", apexDepsMutator) @@ -871,7 +871,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD } } -func apexBundleFactory() android.Module { +func ApexBundleFactory() android.Module { module := &apexBundle{ outputFiles: map[apexPackaging]android.WritablePath{}, } diff --git a/apex/apex_test.go b/apex/apex_test.go index d1794ee5c..b1788297e 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -28,7 +28,7 @@ func testApex(t *testing.T, bp string) *android.TestContext { defer teardown(buildDir) ctx := android.NewTestArchContext() - ctx.RegisterModuleType("apex", android.ModuleFactoryAdaptor(apexBundleFactory)) + ctx.RegisterModuleType("apex", android.ModuleFactoryAdaptor(ApexBundleFactory)) ctx.RegisterModuleType("apex_key", android.ModuleFactoryAdaptor(apexKeyFactory)) ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {