diff options
| author | 2023-12-20 19:00:49 +0000 | |
|---|---|---|
| committer | 2023-12-20 19:00:49 +0000 | |
| commit | 412b33a6e7af8a2794bb750fb6d71bfab3a10661 (patch) | |
| tree | 3b74224321c64dbcebf1416047ad0da2b207279f /java/bootclasspath_fragment.go | |
| parent | 9734cff08ce8dbf83e74d7d6ec037b85bf54f7f9 (diff) | |
| parent | 5be6333692b6881b223b672c2251efaf4605bb33 (diff) | |
Merge "Use the correct bootjars when multiple prebuilt apexes exist" into main
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 010dbec8f..ae2440466 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -385,6 +385,10 @@ func (i BootclasspathFragmentApexContentInfo) DexBootJarPathForContentModule(mod } } +func (i BootclasspathFragmentApexContentInfo) DexBootJarPathMap() bootDexJarByModule { + return i.contentModuleDexJarPaths +} + func (i BootclasspathFragmentApexContentInfo) ProfilePathOnHost() android.Path { return i.profilePathOnHost } @@ -1034,10 +1038,6 @@ func (module *PrebuiltBootclasspathFragmentModule) produceHiddenAPIOutput(ctx an return android.PathForModuleSrc(ctx, *src) } - // Retrieve the dex files directly from the content modules. They in turn should retrieve the - // encoded dex jars from the prebuilt .apex files. - encodedBootDexJarsByModule := extractEncodedDexJarsFromModules(ctx, contents) - output := HiddenAPIOutput{ HiddenAPIFlagOutput: HiddenAPIFlagOutput{ AnnotationFlagsPath: pathForSrc("hidden_api.annotation_flags", module.prebuiltProperties.Hidden_api.Annotation_flags), @@ -1048,8 +1048,6 @@ func (module *PrebuiltBootclasspathFragmentModule) produceHiddenAPIOutput(ctx an StubFlagsPath: pathForOptionalSrc(module.prebuiltProperties.Hidden_api.Stub_flags, nil), AllFlagsPath: pathForOptionalSrc(module.prebuiltProperties.Hidden_api.All_flags, nil), }, - - EncodedBootDexFilesByModule: encodedBootDexJarsByModule, } // TODO: Temporarily fallback to stub_flags/all_flags properties until prebuilts have been updated. |