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

Rename DexJar interface method to DexJarBuildPath.

Browse Source 
This is a prerequisite change before adding DexJarInstallPath.

Test: lunch aosp_cf_phone-userdebug && m
Change-Id: I033e08b8bb06c0a844a6bbbfcdc48ce33e9c95cf
This commit is contained in:
Ulya Trafimovich
2020-06-03 11:40:45 +01:00
parent 4a19d08d39
commit 562c240185
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{ 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.