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

Commit 34b080dd authored by Jared Duke's avatar Jared Duke
Browse files

Enable referencing of aapt-generated proguard flags 

Some targets may implement classes declared elsewhere, e.g., system
server implements services defined in framework-res.apk's manifest.
Allow depending on the aapt-generated proguard flags for a given
target to support this.

Bug: 272495195
Test: m + reference ":framework-res{.aapt.proguardOptionsFile}"
Change-Id: I2a16632ed6e5a9bddbe326bdb7ab0dd79b45e587
parent 9241da96

java/app.go

+4 −0
Original line number Diff line number Diff line
@@ -976,6 +976,10 @@ func (a *AndroidApp) DepIsInSameApex(ctx android.BaseModuleContext, dep android. 
// For OutputFileProducer interface

func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) {

	switch tag {

	// In some instances, it can be useful to reference the aapt-generated flags from another

	// target, e.g., system server implements services declared in the framework-res manifest.

	case ".aapt.proguardOptionsFile":

		return []android.Path{a.proguardOptionsFile}, nil

	case ".aapt.srcjar":

		return []android.Path{a.aaptSrcJar}, nil

	case ".export-package.apk":