Revert^2 "Rename DexJar interface method to DexJarBuildPath."

This reverts commit b0dc851ff4.

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
This commit is contained in:
Ulyana Trafimovich
2020-06-04 14:08:17 +00:00
committed by Ulya Trafimovich
parent c55b679e7b
commit 5539e7b568
7 changed files with 12 additions and 12 deletions

View File

@@ -255,7 +255,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
return -1, nil
}
jar, hasJar := module.(interface{ DexJar() android.Path })
jar, hasJar := module.(interface{ DexJarBuildPath() android.Path })
if !hasJar {
return -1, nil
}
@@ -296,7 +296,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
panic("unknown boot image: " + image.name)
}
return index, jar.DexJar()
return index, jar.DexJarBuildPath()
}
// buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image.