StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make apex.ApexBundleFactory public

Browse Source 
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
This commit is contained in:
Alex Light
2018-12-06 14:00:02 -08:00
parent 080c2455a3
commit ee25072e35
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -136,7 +136,7 @@ func init() {
pctx.HostBinToolVariable("zip2zip", "zip2zip") pctx.HostBinToolVariable("zip2zip", "zip2zip")
pctx.HostBinToolVariable("zipalign", "zipalign") pctx.HostBinToolVariable("zipalign", "zipalign")
android.RegisterModuleType("apex", apexBundleFactory) android.RegisterModuleType("apex", ApexBundleFactory)
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.TopDown("apex_deps", apexDepsMutator) 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{ module := &apexBundle{
outputFiles: map[apexPackaging]android.WritablePath{}, outputFiles: map[apexPackaging]android.WritablePath{},
} }

2
apex/apex_test.go
View File

@@ -28,7 +28,7 @@ func testApex(t *testing.T, bp string) *android.TestContext {
defer teardown(buildDir) defer teardown(buildDir)
ctx := android.NewTestArchContext() ctx := android.NewTestArchContext()
ctx.RegisterModuleType("apex", android.ModuleFactoryAdaptor(apexBundleFactory)) ctx.RegisterModuleType("apex", android.ModuleFactoryAdaptor(ApexBundleFactory))
ctx.RegisterModuleType("apex_key", android.ModuleFactoryAdaptor(apexKeyFactory)) ctx.RegisterModuleType("apex_key", android.ModuleFactoryAdaptor(apexKeyFactory))
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {