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

Store dex jar paths in bootclasspath_fragment's apex content info

Browse Source 
Previously, the DexBootJarPathForContentModule(module) simply called
directly through to the module to retrieve the dex jar path. This
change changes it so the bootclasspath_fragment retrieves the dex
jars from the module and stores them in the info structure for this
method to retrieve directly.

This makes it easier for the bootclasspath_fragment to stop retrieving
hidden API encoded dex jars from the module and perform the encoding
itself.

Bug: 179354495
Test: m com.android.art com.android.ipsec com.android.os.statsd com.android.conscrypt
      - verify that this does not change the contents of the apex files
Change-Id: Ic79dea080f10f4017f1a75d6d1fb5a3bfe04c2ce
This commit is contained in:
Paul Duffin
2021-05-15 12:39:23 +01:00
parent 4de9450433
commit 1a8010a241
3 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex.go
View File

@@ -2149,7 +2149,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.