Merge "Make apex.ApexBundleFactory public"

am: dfaf769841

Change-Id: I7d6dcb454627a712897f3c4e15b8dcc72323e09e
This commit is contained in:
Alex Light 2018-12-06 17:44:03 -08:00 committed by android-build-merger
commit 52050be9b5
2 changed files with 3 additions and 3 deletions

View file

@ -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{},
}

View file

@ -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) {