diff options
| author | 2023-07-11 20:59:07 +0000 | |
|---|---|---|
| committer | 2023-07-11 20:59:07 +0000 | |
| commit | b898c112a2a4f14580a7f9c96355450034b33893 (patch) | |
| tree | 72b18d1121999c72d3bf37791b98edea6bb10183 /java/bootclasspath_fragment.go | |
| parent | 120b55a7ca624d5b2e95fa7d750fb0c4046f7f50 (diff) | |
| parent | 3444e561dc4b331fcb5381fa3dd9d31439692469 (diff) | |
Merge changes I0918f2fa,I3fc6ff91,I7adc97cb,I674a5fa1,I22c45cbf into main
* changes:
Change the profile path on host.
Extract duplicate code to common helper functions.
Fix dumpOatRules.
Remove Modules() from BootclasspathFragmentApexContentInfo.
Fix some tests for dexpreopt and remove unnecessary tests.
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 50429b07a..ac45ce181 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -389,10 +389,6 @@ var BootclasspathFragmentApexContentInfoProvider = blueprint.NewProvider(Bootcla // BootclasspathFragmentApexContentInfo contains the bootclasspath_fragments contributions to the // apex contents. type BootclasspathFragmentApexContentInfo struct { - // The configured modules, will be empty if this is from a bootclasspath_fragment that does not - // set image_name: "art". - modules android.ConfiguredJarList - // Map from the base module name (without prebuilt_ prefix) of a fragment's contents module to the // hidden API encoded dex jar path. contentModuleDexJarPaths bootDexJarByModule @@ -405,10 +401,6 @@ type BootclasspathFragmentApexContentInfo struct { profileInstallPathInApex string } -func (i BootclasspathFragmentApexContentInfo) Modules() android.ConfiguredJarList { - return i.modules -} - // DexBootJarPathForContentModule returns the path to the dex boot jar for specified module. // // The dex boot jar is one which has had hidden API encoding performed on it. @@ -597,7 +589,6 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC } if imageConfig != nil { - info.modules = imageConfig.modules global := dexpreopt.GetGlobalConfig(ctx) if !global.DisableGenerateProfile { info.profilePathOnHost = bootImageFiles.profile |