From 4c5da94fa4320aa868203ad2128fb49492274c73 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Thu, 30 Mar 2023 16:40:24 -0700 Subject: [PATCH] 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}" (cherry picked from https://android-review.googlesource.com/q/commit:34b080ddcf7757bba3dcb938df46aa660b2564a0) Merged-In: I2a16632ed6e5a9bddbe326bdb7ab0dd79b45e587 Change-Id: I2a16632ed6e5a9bddbe326bdb7ab0dd79b45e587 --- java/app.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/app.go b/java/app.go index 706f99a83..d333a8977 100755 --- a/java/app.go +++ b/java/app.go @@ -925,6 +925,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":