Use the correct bootjars when multiple prebuilt apexes exist
hiddenapi and dexpreopt require boot and system server jars from apexes. When building with prebuilts, this comes via java_import/java_sdk_library_import, which acts as a hook for prebuilt_apex/apex_set. If we have multiple apexes in the tree, this hook becomes 1:many. This CL prepares dex_bootjars to select the right deapexerd .jar files when mutliple prebuilts exist. Implementation details - Update prebuilt module types (prebuilt_apex/apex_set) and source apexes to set a map of library name to dex jar path on host. - dex_bootjars will access the path of the .dex jar on host via the provider. These then copied/installed to the right locations. This CL does not drop the old mechanism to get the dex file (i.e. by creating a dep on java_library). Once all mainline modules have been flagged using apex_contributions, the old mechanism will be dropped Bug: 308790457 Test: git_master-art-host:art-gtest https://android-build.corp.google.com/builds/abtd/run/L21500030000926533 Test: git_main:art_standalone_dexpreopt_tests https://android-build.corp.google.com/builds/abtd/run/L99000030000891212 Test: Added a unit test that checks that the right .jar is selected when multiple prebuilts exists Change-Id: I6ef94135b9303a35135810930af4b641df13a583
This commit is contained in:
@@ -79,6 +79,10 @@ type DeapexerInfo struct {
|
||||
//
|
||||
// See Prebuilt.ApexInfoMutator for more information.
|
||||
exports map[string]WritablePath
|
||||
|
||||
// name of the java libraries exported from the apex
|
||||
// e.g. core-libart
|
||||
exportedModuleNames []string
|
||||
}
|
||||
|
||||
// ApexModuleName returns the name of the APEX module that provided the info.
|
||||
@@ -97,6 +101,10 @@ func (i DeapexerInfo) PrebuiltExportPath(apexRelativePath string) WritablePath {
|
||||
return path
|
||||
}
|
||||
|
||||
func (i DeapexerInfo) GetExportedModuleNames() []string {
|
||||
return i.exportedModuleNames
|
||||
}
|
||||
|
||||
// Provider that can be used from within the `GenerateAndroidBuildActions` of a module that depends
|
||||
// on a `deapexer` module to retrieve its `DeapexerInfo`.
|
||||
var DeapexerProvider = blueprint.NewProvider[DeapexerInfo]()
|
||||
@@ -105,10 +113,11 @@ var DeapexerProvider = blueprint.NewProvider[DeapexerInfo]()
|
||||
// for use with a prebuilt_apex module.
|
||||
//
|
||||
// See apex/deapexer.go for more information.
|
||||
func NewDeapexerInfo(apexModuleName string, exports map[string]WritablePath) DeapexerInfo {
|
||||
func NewDeapexerInfo(apexModuleName string, exports map[string]WritablePath, moduleNames []string) DeapexerInfo {
|
||||
return DeapexerInfo{
|
||||
apexModuleName: apexModuleName,
|
||||
exports: exports,
|
||||
apexModuleName: apexModuleName,
|
||||
exports: exports,
|
||||
exportedModuleNames: moduleNames,
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user