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

Merge "Propagate java resources in apps with no code" am: 2ee47272f5 am: f6316c4b1c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9f21c21508658da4cad91202315e3589b939c7f
This commit is contained in:
Treehugger Robot
2021-02-28 02:09:14 +00:00
committed by Automerger Merge Worker
parent d5dbda4c0f f6316c4b1c
commit 5541754e5a
4 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@@ -469,7 +469,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) android.Path {
a.Module.compile(ctx, a.aaptSrcJar)
}
return a.maybeStrippedDexJarFile
return a.dexJarFile
}
func (a *AndroidApp) jniBuildActions(jniLibs []jniLib, ctx android.ModuleContext) android.WritablePath {