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

Merge "Remove retrieveLegacyEncodedBootDexFiles" into main am: 81ac6e74df

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

Change-Id: Ie1ac557250fb60091e003bd3416f29955b949ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-03 02:15:29 +00:00
committed by Automerger Merge Worker
parent 2ba836b13a 81ac6e74df
commit df1bcdca0e
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/bootclasspath_fragment.go
View File

@@ -632,21 +632,6 @@ func (b *BootclasspathFragmentModule) generateHiddenAPIBuildActions(ctx android.
return output return output
} }
// retrieveLegacyEncodedBootDexFiles attempts to retrieve the legacy encoded boot dex jar files.
func retrieveLegacyEncodedBootDexFiles(ctx android.ModuleContext, contents []android.Module) bootDexJarByModule {
// If the current bootclasspath_fragment is the active module or a source module then retrieve the
// encoded dex files, otherwise return an empty map.
//
// An inactive (i.e. not preferred) bootclasspath_fragment needs to retrieve the encoded dex jars
// as they are still needed by an apex. An inactive prebuilt_bootclasspath_fragment does not need
// to do so and may not yet have access to dex boot jars from a prebuilt_apex/apex_set.
if isActiveModule(ctx.Module()) || !android.IsModulePrebuilt(ctx.Module()) {
return extractEncodedDexJarsFromModules(ctx, contents)
} else {
return nil
}
}
// createHiddenAPIFlagInput creates a HiddenAPIFlagInput struct and initializes it with information derived // createHiddenAPIFlagInput creates a HiddenAPIFlagInput struct and initializes it with information derived
// from the properties on this module and its dependencies. // from the properties on this module and its dependencies.
func (b *BootclasspathFragmentModule) createHiddenAPIFlagInput(ctx android.ModuleContext, contents []android.Module, fragments []android.Module) HiddenAPIFlagInput { func (b *BootclasspathFragmentModule) createHiddenAPIFlagInput(ctx android.ModuleContext, contents []android.Module, fragments []android.Module) HiddenAPIFlagInput {