From 4b97a5661584e6db7942146e6dd0f343f4c6108e Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Thu, 17 Dec 2020 09:43:28 -0800 Subject: Remove the return value from dexpreopt dexpreopt doesn't strip dex files from the input jar anymore, so there's no point returning the input jar path untouched. Test: m nothing + TreeHugger Change-Id: I8fde6cdc19e85a2fbc946513696417b945c5de0f --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 02d78f2bf..9e47b2f20 100644 --- a/java/java.go +++ b/java/java.go @@ -1786,7 +1786,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { j.dexJarFile = dexOutputFile // Dexpreopting - dexOutputFile = j.dexpreopt(ctx, dexOutputFile) + j.dexpreopt(ctx, dexOutputFile) j.maybeStrippedDexJarFile = dexOutputFile @@ -3123,7 +3123,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.dexJarFile = dexOutputFile - dexOutputFile = j.dexpreopt(ctx, dexOutputFile) + j.dexpreopt(ctx, dexOutputFile) j.maybeStrippedDexJarFile = dexOutputFile -- cgit v1.2.3-59-g8ed1b