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

Commit c292fa17 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Export resource processor R.jar files to ASfP" into main

parents f583bafc 95b53b83

java/aar.go

+11 −0
Original line number Diff line number Diff line
@@ -849,6 +849,17 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) 
	}

}



func (a *AndroidLibrary) IDEInfo(dpInfo *android.IdeInfo) {

	a.Library.IDEInfo(dpInfo)

	a.aapt.IDEInfo(dpInfo)

}



func (a *aapt) IDEInfo(dpInfo *android.IdeInfo) {

	if a.useResourceProcessorBusyBox() {

		dpInfo.Jars = append(dpInfo.Jars, a.rJar.String())

	}

}



// android_library builds and links sources into a `.jar` file for the device along with Android resources.

//

// An android_library has a single variant that produces a `.jar` file containing `.class` files that were

java/app.go

+5 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,11 @@ func (a *AndroidApp) EnableCoverageIfNeeded() {} 


var _ cc.Coverage = (*AndroidApp)(nil)



func (a *AndroidApp) IDEInfo(dpInfo *android.IdeInfo) {

	a.Library.IDEInfo(dpInfo)

	a.aapt.IDEInfo(dpInfo)

}



// android_app compiles sources and Android resources into an Android application package `.apk` file.

func AndroidAppFactory() android.Module {

	module := &AndroidApp{}