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

Commit fabdd28f authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Make apex modules support tagged dists"

parents c0ea1701 82d502a7

apex/androidmk.go

+4 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ func (a *apexBundle) writeRequiredModules(w io.Writer) { 


func (a *apexBundle) androidMkForType() android.AndroidMkData {

	return android.AndroidMkData{

		DistFiles: a.distFiles,

		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {

			moduleNames := []string{}

			apexType := a.properties.ApexType
@@ -391,6 +392,9 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
					fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n",

						goal, a.installedFilesFile.String(), distFile)

				}

				for _, dist := range data.Entries.GetDistForGoals(a) {

					fmt.Fprintf(w, dist)

				}

			}

		}}

}

apex/apex.go

+4 −0
Original line number Diff line number Diff line
@@ -1477,6 +1477,8 @@ type apexBundle struct { 
	lintReports android.Paths



	payloadFsType fsType



	distFiles android.TaggedDistFiles

}



func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
@@ -2522,6 +2524,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	a.buildApexDependencyInfo(ctx)



	a.buildLintReports(ctx)



	a.distFiles = a.GenerateTaggedDistFiles(ctx)

}



// Enforce that Java deps of the apex are using stable SDKs to compile