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

Commit 2ea9ac41 authored by Jaewoong Jung's avatar Jaewoong Jung Committed by android-build-merger
Browse files

Merge "Make PrebuiltEtcHostFactory public." am: 0dcfee56 

am: 4c8f7984

Change-Id: Id7c981c50fc2e69596ee0f890adcf91faec44994
parents 04fec6c3 4c8f7984

android/prebuilt_etc.go

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import ( 


func init() {

	RegisterModuleType("prebuilt_etc", PrebuiltEtcFactory)

	RegisterModuleType("prebuilt_etc_host", prebuiltEtcHostFactory)

	RegisterModuleType("prebuilt_etc_host", PrebuiltEtcHostFactory)



	PreDepsMutators(func(ctx RegisterMutatorsContext) {

		ctx.BottomUp("prebuilt_etc", prebuiltEtcMutator).Parallel()
@@ -182,7 +182,7 @@ func PrebuiltEtcFactory() Module { 
	return module

}



func prebuiltEtcHostFactory() Module {

func PrebuiltEtcHostFactory() Module {

	module := &PrebuiltEtc{}

	InitPrebuiltEtcModule(module)

	// This module is host-only

android/prebuilt_etc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ func testPrebuiltEtc(t *testing.T, bp string) *TestContext { 
	defer tearDown(buildDir)

	ctx := NewTestArchContext()

	ctx.RegisterModuleType("prebuilt_etc", ModuleFactoryAdaptor(PrebuiltEtcFactory))

	ctx.RegisterModuleType("prebuilt_etc_host", ModuleFactoryAdaptor(prebuiltEtcHostFactory))

	ctx.RegisterModuleType("prebuilt_etc_host", ModuleFactoryAdaptor(PrebuiltEtcHostFactory))

	ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) {

		ctx.BottomUp("prebuilt_etc", prebuiltEtcMutator).Parallel()

	})