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

Commit 95b53b83 authored Oct 17, 2023 by Colin Cross

Export resource processor R.jar files to ASfP

Export the R.jar files generated by ResourceProcessorBusyBox to
module_bp_java_deps.json for use by Android Studio for Platform.

Bug: 305997998
Test: examine module_bp_java_deps.json
Change-Id: I48e3e28b45219646765de7848ec9dbe77d14c662

parent bc98b415

java/aar.go

+11 −0

Original line number	Diff line number	Diff line
		@@ -819,6 +819,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{}