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

Support mechanism to select a specific version of module sdk prebuilt

Browse Source 
This CL is the java_system_modules_import equivalent of aosp/2928483.

With trunk stable, we will have multiple versions of art prebuilt apex
in the tree. Each art apex will contribute its own module sdk, i.e. its
own prebuilt system_modules to the build. This CL introduces a mechanism
to selelect a specific version of prebuilt system modules using
apex_contributions.

Implementation details: Create a new source_module_name property to
identify the root module. rdeps referring to the root module will get
redirected if necessary.

Bug: 322175508

Test: Added a unit test
Change-Id: I9f885ffa5afea96d2e6ce077264d3b207ed7e80d
This commit is contained in:
Spandan Das
2024-01-19 00:22:22 +00:00
parent 7870d329a5
commit cc53063b07
2 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/system_modules.go
View File

@@ -19,6 +19,7 @@ import (
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
"android/soong/android"
)
@@ -210,7 +211,7 @@ func (system *SystemModules) AndroidMk() android.AndroidMkData {
// type and the one to use is selected at runtime.
func systemModulesImportFactory() android.Module {
module := &systemModulesImport{}
module.AddProperties(&module.properties)
module.AddProperties(&module.properties, &module.prebuiltProperties)
android.InitPrebuiltModule(module, &module.properties.Libs)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
@@ -219,13 +220,39 @@ func systemModulesImportFactory() android.Module {
type systemModulesImport struct {
SystemModules
prebuilt android.Prebuilt
prebuilt android.Prebuilt
prebuiltProperties prebuiltSystemModulesProperties
}
type prebuiltSystemModulesProperties struct {
// Name of the source soong module that gets shadowed by this prebuilt
// If unspecified, follows the naming convention that the source module of
// the prebuilt is Name() without "prebuilt_" prefix
Source_module_name *string
}
func (system *systemModulesImport) Name() string {
return system.prebuilt.Name(system.ModuleBase.Name())
}
// BaseModuleName returns the source module that will get shadowed by this prebuilt
// e.g.
//
// java_system_modules_import {
// name: "my_system_modules.v1",
// source_module_name: "my_system_modules",
// }
//
// java_system_modules_import {
// name: "my_system_modules.v2",
// source_module_name: "my_system_modules",
// }
//
// `BaseModuleName` for both will return `my_system_modules`
func (system *systemModulesImport) BaseModuleName() string {
return proptools.StringDefault(system.prebuiltProperties.Source_module_name, system.ModuleBase.Name())
}
func (system *systemModulesImport) Prebuilt() *android.Prebuilt {
return &system.prebuilt
}