StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Rename DexJar interface method to DexJarBuildPath."

Browse Source 
This reverts commit 562c240185.

Reason for revert: breaks `lunch full-eng && m checkbuild`.

Change-Id: Id7c7d6240d98afaf8edd49b6c96cd05534b784cc
This commit is contained in:
Ulyana Trafimovich
2020-06-04 10:37:36 +00:00
parent 562c240185
commit b0dc851ff4
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/dexpreopt_bootjars.go
View File

@@ -255,7 +255,7 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
return -1, nil
}
jar, hasJar := module.(interface{ DexJarBuildPath() android.Path })
jar, hasJar := module.(interface{ DexJar() 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.DexJarBuildPath()
return index, jar.DexJar()
}
// buildBootImage takes a bootImageConfig, creates rules to build it, and returns the image.