Revert^2 "Rename DexJar interface method to DexJarBuildPath."
This reverts commit b0dc851ff4eca650042b52ce4ff06cb7e0312b77.
Reason for revert: relanding original change. Build failures were
caused by a race with another CL: https://r.android.com/1320920
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Ic9016582dae7773b4d4f84a63425f1ef7a5d061f
diff --git a/java/app.go b/java/app.go
index a45ab6f..fb02c99 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1882,7 +1882,7 @@
if !ctx.Config().UnbundledBuild() {
ctx.VisitDirectDepsWithTag(usesLibTag, func(m android.Module) {
if lib, ok := m.(Dependency); ok {
- if dexJar := lib.DexJar(); dexJar != nil {
+ if dexJar := lib.DexJarBuildPath(); dexJar != nil {
usesLibPaths[ctx.OtherModuleName(m)] = dexJar
} else {
ctx.ModuleErrorf("module %q in uses_libs or optional_uses_libs must produce a dex jar, does it have installable: true?",