StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable referencing of aapt-generated proguard flags

Browse Source 
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
This commit is contained in:
Jared Duke
2023-03-30 16:40:24 -07:00
parent 9241da9662
commit 34b080ddcf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/app.go
View File

@@ -976,6 +976,10 @@ func (a *AndroidApp) DepIsInSameApex(ctx android.BaseModuleContext, dep android.
// For OutputFileProducer interface // For OutputFileProducer interface
func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) { func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) {
switch tag { 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": case ".aapt.srcjar":
return []android.Path{a.aaptSrcJar}, nil return []android.Path{a.aaptSrcJar}, nil
case ".export-package.apk": case ".export-package.apk":