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

Commit f52900d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable referencing of aapt-generated proguard flags" am: 7fecde90 am:... 

Merge "Enable referencing of aapt-generated proguard flags" am: 7fecde90 am: dd1a7fff am: 543d28cb

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516696



Change-Id: Ib805782a3da76a016699f5a724999905446a6d4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbdae4b6 543d28cb

java/app.go

+4 −0
Original line number Diff line number Diff line
@@ -977,6 +977,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":