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

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

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

Change-Id: I1de940d7b3bfadc5dbb9756941681f6bff70b2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-20 04:27:54 +00:00
committed by Automerger Merge Worker
parent f49d3811bd 7fecde9041
commit dd1a7ffff5
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

@@ -977,6 +977,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":