diff --git a/java/base.go b/java/base.go
index ef299b2..f9e1b38 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1736,7 +1736,9 @@
 	}
 
 	if j.shouldInstrument(ctx) {
-		outputFile = j.instrument(ctx, flags, outputFile, jarName, specs)
+		instrumentedOutputFile := j.instrument(ctx, flags, outputFile, jarName, specs)
+		completeStaticLibsImplementationJars = android.NewDepSet(android.PREORDER, android.Paths{instrumentedOutputFile}, nil)
+		outputFile = instrumentedOutputFile
 	}
 
 	// merge implementation jar with resources if necessary