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

Commit 42f69972 authored by Yu Liu's avatar Yu Liu
Browse files

Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy. 

Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Iabae176799282e86cc67efc50b91de847181bf0d
parent f432c2ee

java/aar.go

+4 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,8 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) 
		AconfigTextFiles: aconfigTextFilePaths,

	})



	android.SetProvider(ctx, AndroidLibraryInfoProvider, AndroidLibraryInfo{})



	a.setOutputFiles(ctx)

}
@@ -1574,6 +1576,8 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		JniPackages: a.jniPackages,

	})



	android.SetProvider(ctx, AndroidLibraryInfoProvider, AndroidLibraryInfo{})



	ctx.SetOutputFiles([]android.Path{a.implementationAndResourcesJarFile}, "")

	ctx.SetOutputFiles([]android.Path{a.aarPath}, ".aar")

}

java/app.go

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ type FlagsPackages struct { 


var FlagsPackagesProvider = blueprint.NewProvider[FlagsPackages]()



type AndroidLibraryInfo struct {

	// Empty for now

}



var AndroidLibraryInfoProvider = blueprint.NewProvider[AndroidLibraryInfo]()



func RegisterAppBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("android_app", AndroidAppFactory)

	ctx.RegisterModuleType("android_test", AndroidTestFactory)
@@ -424,6 +430,8 @@ func (a *AndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		EmbeddedJNILibs: embeddedJniLibs,

	})



	android.SetProvider(ctx, AndroidLibraryInfoProvider, AndroidLibraryInfo{})



	a.requiredModuleNames = a.getRequiredModuleNames(ctx)

}