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

Merge "Revert "Deduplicate APEX variants that would build identically"" am: fc4d79598c am: b1d3c4c4d7

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

Change-Id: Ia2db2038480c3e09e7c82c1766f9b922e5cc6a11
This commit is contained in:
Treehugger Robot
2020-08-18 17:42:08 +00:00
committed by Automerger Merge Worker
parent 813ec416ee b1d3c4c4d7
commit 671aed59c9
12 changed files with 108 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
android/apex.go
View File

@@ -34,17 +34,6 @@ type ApexInfo struct {
MinSdkVersion int
Updatable bool
RequiredSdks SdkRefs
InApexes []string
}
func (i ApexInfo) mergedName() string {
name := "apex" + strconv.Itoa(i.MinSdkVersion)
for _, sdk := range i.RequiredSdks {
name += "_" + sdk.Name + "_" + sdk.Version
}
return name
}
// Extracted from ApexModule to make it easier to define custom subsets of the
@@ -80,20 +69,17 @@ type ApexModule interface {
// Call this before apex.apexMutator is run.
BuildForApex(apex ApexInfo)
// Returns the APEXes that this module will be built for
ApexVariations() []ApexInfo
// Returns the name of APEX variation that this module will be built for.
// Empty string is returned when 'IsForPlatform() == true'. Note that a
// module can beincluded in multiple APEXes, in which case, the module
// is mutated into one or more variants, each of which is for one or
// more APEXes. This method returns the name of the APEX variation of
// the module.
//Empty string is returned when 'IsForPlatform() == true'. Note that a
// module can be included in multiple APEXes, in which case, the module
// is mutated into multiple modules each of which for an APEX. This method
// returns the name of the APEX that a variant module is for.
// Call this after apex.apexMutator is run.
ApexVariationName() string
// Returns the name of the APEX modules that this variant of this module
// is present in.
// Call this after apex.apexMutator is run.
InApexes() []string
// Tests whether this module will be built for the platform or not.
// This is a shortcut for ApexVariationName() == ""
IsForPlatform() bool
@@ -142,15 +128,6 @@ type ApexModule interface {
// Returns nil if this module supports sdkVersion
// Otherwise, returns error with reason
ShouldSupportSdkVersion(ctx BaseModuleContext, sdkVersion int) error
// Returns true if this module needs a unique variation per apex, for example if
// use_apex_name_macro is set.
UniqueApexVariations() bool
// UpdateUniqueApexVariationsForDeps sets m.uniqueApexVariationsForDeps if any dependencies
// that are in the same APEX have unique APEX variations so that the module can link against
// the right variant.
UpdateUniqueApexVariationsForDeps(mctx BottomUpMutatorContext)
}
type ApexProperties struct {
@@ -167,8 +144,6 @@ type ApexProperties struct {
Info ApexInfo `blueprint:"mutated"`
NotAvailableForPlatform bool `blueprint:"mutated"`
UniqueApexVariationsForDeps bool `blueprint:"mutated"`
}
// Marker interface that identifies dependencies that are excluded from APEX
@@ -204,22 +179,6 @@ func (m *ApexModuleBase) TestFor() []string {
return nil
}
func (m *ApexModuleBase) UniqueApexVariations() bool {
return false
}
func (m *ApexModuleBase) UpdateUniqueApexVariationsForDeps(mctx BottomUpMutatorContext) {
mctx.VisitDirectDeps(func(dep Module) {
if depApexModule, ok := dep.(ApexModule); ok {
if depApexModule.DepIsInSameApex(mctx, depApexModule) &&
(depApexModule.UniqueApexVariations() ||
depApexModule.apexModuleBase().ApexProperties.UniqueApexVariationsForDeps) {
m.ApexProperties.UniqueApexVariationsForDeps = true
}
}
})
}
func (m *ApexModuleBase) BuildForApex(apex ApexInfo) {
m.apexVariationsLock.Lock()
defer m.apexVariationsLock.Unlock()
@@ -231,12 +190,12 @@ func (m *ApexModuleBase) BuildForApex(apex ApexInfo) {
m.apexVariations = append(m.apexVariations, apex)
}
func (m *ApexModuleBase) ApexVariationName() string {
return m.ApexProperties.Info.ApexVariationName
func (m *ApexModuleBase) ApexVariations() []ApexInfo {
return m.apexVariations
}
func (m *ApexModuleBase) InApexes() []string {
return m.ApexProperties.Info.InApexes
func (m *ApexModuleBase) ApexVariationName() string {
return m.ApexProperties.Info.ApexVariationName
}
func (m *ApexModuleBase) IsForPlatform() bool {
@@ -319,45 +278,14 @@ func (a byApexName) Len() int { return len(a) }
func (a byApexName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func (a byApexName) Less(i, j int) bool { return a[i].ApexVariationName < a[j].ApexVariationName }
// mergeApexVariations deduplicates APEX variations that would build identically into a common
// variation. It returns the reduced list of variations and a list of aliases from the original
// variation names to the new variation names.
func mergeApexVariations(apexVariations []ApexInfo) (merged []ApexInfo, aliases [][2]string) {
sort.Sort(byApexName(apexVariations))
seen := make(map[string]int)
for _, apexInfo := range apexVariations {
apexName := apexInfo.ApexVariationName
mergedName := apexInfo.mergedName()
if index, exists := seen[mergedName]; exists {
merged[index].InApexes = append(merged[index].InApexes, apexName)
merged[index].Updatable = merged[index].Updatable || apexInfo.Updatable
} else {
seen[mergedName] = len(merged)
apexInfo.ApexVariationName = apexInfo.mergedName()
apexInfo.InApexes = CopyOf(apexInfo.InApexes)
merged = append(merged, apexInfo)
}
aliases = append(aliases, [2]string{apexName, mergedName})
}
return merged, aliases
}
func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []Module {
if len(m.apexVariations) > 0 {
m.checkApexAvailableProperty(mctx)
var apexVariations []ApexInfo
var aliases [][2]string
if !mctx.Module().(ApexModule).UniqueApexVariations() && !m.ApexProperties.UniqueApexVariationsForDeps {
apexVariations, aliases = mergeApexVariations(m.apexVariations)
} else {
apexVariations = m.apexVariations
}
sort.Sort(byApexName(apexVariations))
sort.Sort(byApexName(m.apexVariations))
variations := []string{}
variations = append(variations, "") // Original variation for platform
for _, apex := range apexVariations {
for _, apex := range m.apexVariations {
variations = append(variations, apex.ApexVariationName)
}
@@ -374,14 +302,9 @@ func (m *ApexModuleBase) CreateApexVariations(mctx BottomUpMutatorContext) []Mod
mod.MakeUninstallable()
}
if !platformVariation {
mod.(ApexModule).apexModuleBase().ApexProperties.Info = apexVariations[i-1]
mod.(ApexModule).apexModuleBase().ApexProperties.Info = m.apexVariations[i-1]
}
}
for _, alias := range aliases {
mctx.CreateAliasVariation(alias[0], alias[1])
}
return modules
}
return nil
@@ -416,9 +339,6 @@ func UpdateApexDependency(apex ApexInfo, moduleName string, directDep bool) {
apexNamesMap()[moduleName] = apexesForModule
}
apexesForModule[apex.ApexVariationName] = apexesForModule[apex.ApexVariationName] || directDep
for _, apexName := range apex.InApexes {
apexesForModule[apexName] = apexesForModule[apex.ApexVariationName] || directDep
}
}
// TODO(b/146393795): remove this when b/146393795 is fixed
@@ -434,26 +354,12 @@ func ClearApexDependency() {
func DirectlyInApex(apexName string, moduleName string) bool {
apexNamesMapMutex.Lock()
defer apexNamesMapMutex.Unlock()
if apexNamesForModule, ok := apexNamesMap()[moduleName]; ok {
return apexNamesForModule[apexName]
if apexNames, ok := apexNamesMap()[moduleName]; ok {
return apexNames[apexName]
}
return false
}
// Tests whether a module named moduleName is directly depended on by all APEXes
// in a list of apexNames.
func DirectlyInAllApexes(apexNames []string, moduleName string) bool {
apexNamesMapMutex.Lock()
defer apexNamesMapMutex.Unlock()
for _, apexName := range apexNames {
apexNamesForModule := apexNamesMap()[moduleName]
if !apexNamesForModule[apexName] {
return false
}
}
return true
}
type hostContext interface {
Host() bool
}