From b014f0787edaa598e4d7186fc174c28b0091ed3a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 26 Feb 2021 14:54:36 -0800 Subject: Propagate java resources in apps with no code Use the java resources jar as the dex jar when building apps that have no code. Also remove maybeStrippedDexJar, the dex jar is never stripped now. Fixes: 176305357 Test: TestAppJavaResources Change-Id: Ic8b1165bd35d71237d307e7f5f895764e203a10d --- java/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/app.go') diff --git a/java/app.go b/java/app.go index 8287533e0..39f06d004 100755 --- a/java/app.go +++ b/java/app.go @@ -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 { -- cgit v1.2.3-59-g8ed1b