summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Duke <jdduke@google.com> 2023-03-30 16:40:24 -0700
committer Jared Duke <jdduke@google.com> 2023-05-19 20:30:05 +0000
commit34b080ddcf7757bba3dcb938df46aa660b2564a0 (patch)
treec55dbbfd75ee9fd1ba1ab12ecd2d7e7386812a49
parent9241da96626b6e224fbf255f1d03ea0bf4e8958b (diff)
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
-rwxr-xr-xjava/app.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go
index da9c6f343..29a22877c 100755
--- a/java/app.go
+++ b/java/app.go
@@ -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":