From 4bdea39ad2fb3cf3ba26a931fa6e81a29c9257d4 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 15 Jan 2019 11:48:08 +0000 Subject: Don't install java libraries that are already in an apex. This need to have -hostdex rules not look at the installFile. In the near future, all -hostdex files come from jars that are in an apex. bug: 119868597 Test: m Change-Id: I4423626c5ced5d098ddd97c122fbfced54f817fc --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 9c4bd869e..7e82c59d6 100644 --- a/java/java.go +++ b/java/java.go @@ -1395,7 +1395,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx) j.compile(ctx) - if Bool(j.properties.Installable) || ctx.Host() { + if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) { if j.deviceProperties.UncompressDex { alignedOutputFile := android.PathForModuleOut(ctx, "aligned", ctx.ModuleName()+".jar") TransformZipAlign(ctx, alignedOutputFile, j.outputFile) -- cgit v1.2.3-59-g8ed1b