Revert "Remove compilation actions from java sdk library"
Revert submission 3070882-sdk_lib_remove_compilation
Reason for revert: Potential culprit for build breakage of barbet-ap2a-userdebug in git_main
Reverted changes: /q/submissionid:3070882-sdk_lib_remove_compilation
Change-Id: I5135760e13e0152480c68fe91a3c88564e9bc7cb
diff --git a/java/base.go b/java/base.go
index 06c18ca..938ac5e 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1682,11 +1682,7 @@
j.dexJarFile = makeDexJarPathFromPath(dexOutputFile)
// Dexpreopting
- libName := android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName())
- if j.SdkLibraryName() != nil && strings.HasSuffix(ctx.ModuleName(), ".impl") {
- libName = strings.TrimSuffix(libName, ".impl")
- }
- j.dexpreopt(ctx, libName, dexOutputFile)
+ j.dexpreopt(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), dexOutputFile)
outputFile = dexOutputFile
} else {