Merge "Store dex jar paths in bootclasspath_fragment's apex content info" am: bf4e6ec8a7 am: 02d4f36f2c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710510

Change-Id: I751375cd9d4f4c40f776ceb858ecd83e992e4b04
This commit is contained in:
Paul Duffin
2021-05-20 13:34:41 +00:00
committed by Automerger Merge Worker
3 changed files with 55 additions and 10 deletions

View File

@@ -2100,7 +2100,10 @@ func apexFileForBootclasspathFragmentContentModule(ctx android.ModuleContext, fr
// Get the dexBootJar from the bootclasspath_fragment as that is responsible for performing the
// hidden API encpding.
dexBootJar := bootclasspathFragmentInfo.DexBootJarPathForContentModule(javaModule)
dexBootJar, err := bootclasspathFragmentInfo.DexBootJarPathForContentModule(javaModule)
if err != nil {
ctx.ModuleErrorf("%s", err)
}
// Create an apexFile as for a normal java module but with the dex boot jar provided by the
// bootclasspath_fragment.