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

Merge "Add TestApexes to ApexInfo" am: a4c93e3bfc am: 11b5bf51eb am: f04c50722b

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

Change-Id: If0f2e68a29b73d95d945348199ee1ad6c8aec162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-24 09:20:24 +00:00
committed by Automerger Merge Worker
parent 89e03de871 f04c50722b
commit 5d9e1a5ca9
3 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/apex.go
View File

@@ -84,6 +84,9 @@ type ApexInfo struct {
//
// See Prebuilt.ApexInfoMutator for more information.
ForPrebuiltApex bool
// Returns the name of the test apexes that this module is included in.
TestApexes []string
}
var ApexInfoProvider = blueprint.NewMutatorProvider(ApexInfo{}, "apex")
@@ -287,6 +290,9 @@ type ApexProperties struct {
// See ApexModule.UniqueApexVariants()
UniqueApexVariationsForDeps bool `blueprint:"mutated"`
// The test apexes that includes this apex variant
TestApexes []string `blueprint:"mutated"`
}
// Marker interface that identifies dependencies that are excluded from APEX contents.
@@ -429,6 +435,11 @@ func (m *ApexModuleBase) TestFor() []string {
return nil
}
// Returns the test apexes that this module is included in.
func (m *ApexModuleBase) TestApexes() []string {
return m.ApexProperties.TestApexes
}
// Implements ApexModule
func (m *ApexModuleBase) UniqueApexVariations() bool {
// If needed, this will bel overridden by concrete types inheriting
@@ -551,12 +562,14 @@ func mergeApexVariations(ctx PathContext, apexInfos []ApexInfo) (merged []ApexIn
// Platform APIs is allowed for this module only when all APEXes containing
// the module are with `use_platform_apis: true`.
merged[index].UsePlatformApis = merged[index].UsePlatformApis && apexInfo.UsePlatformApis
merged[index].TestApexes = append(merged[index].TestApexes, apexInfo.TestApexes...)
} else {
seen[mergedName] = len(merged)
apexInfo.ApexVariationName = mergedName
apexInfo.InApexVariants = CopyOf(apexInfo.InApexVariants)
apexInfo.InApexModules = CopyOf(apexInfo.InApexModules)
apexInfo.ApexContents = append([]*ApexContents(nil), apexInfo.ApexContents...)
apexInfo.TestApexes = CopyOf(apexInfo.TestApexes)
merged = append(merged, apexInfo)
}
aliases = append(aliases, [2]string{variantName, mergedName})
@@ -604,8 +617,10 @@ func CreateApexVariations(mctx BottomUpMutatorContext, module ApexModule) []Modu
mctx.SetDefaultDependencyVariation(&defaultVariation)
variations := []string{defaultVariation}
testApexes := []string{}
for _, a := range apexInfos {
variations = append(variations, a.ApexVariationName)
testApexes = append(testApexes, a.TestApexes...)
}
modules := mctx.CreateVariations(variations...)
for i, mod := range modules {
@@ -619,6 +634,9 @@ func CreateApexVariations(mctx BottomUpMutatorContext, module ApexModule) []Modu
if !platformVariation {
mctx.SetVariationProvider(mod, ApexInfoProvider, apexInfos[i-1])
}
// Set the value of TestApexes in every single apex variant.
// This allows each apex variant to be aware of the test apexes in the user provided apex_available.
mod.(ApexModule).apexModuleBase().ApexProperties.TestApexes = testApexes
}
for _, alias := range aliases {