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:
committed by
Ulya Trafimovich
parent
c55b679e7b
commit
5539e7b568
@@ -1882,7 +1882,7 @@ func (u *usesLibrary) usesLibraryPaths(ctx android.ModuleContext) map[string]and
|
||||
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?",
|
||||
|
Reference in New Issue
Block a user