Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee25072e authored by Alex Light's avatar Alex Light
Browse files

Make apex.ApexBundleFactory public 

Art needs to be able to create an ApexBundle with a LoadHook to
support art testing using the HOST_PREFER_32_BIT=true hack.

Bug: 120617876
Test: HOST_PREFER_32_BIT=true m nothing
Change-Id: Ia11e61a92094dfbc013c6c53a6edff33371ed8e1
parent 080c2455

apex/apex.go

+2 −2
Original line number Diff line number Diff line
@@ -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{},

	}

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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) {