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

Remove memberInterVersionMutator.

Browse Source 
paulduffin@ says it's not necessary anymore.

Test: Presubmits.
Bug: 232546567
Change-Id: I6ac69fbdc7a202ac54f250ea6cde0ea99d75864c
(cherry picked from commit ab392edc47)
Merged-In: I6ac69fbdc7a202ac54f250ea6cde0ea99d75864c
This commit is contained in:
Lukacs T. Berki
2022-05-20 15:23:06 +02:00
committed by Cherrypicker Worker
parent 09bb15da5e
commit 537b550ee3
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sdk/sdk.go
View File

@@ -281,7 +281,6 @@ var _ android.SdkDependencyContext = (*dependencyContext)(nil)
func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) { func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("SdkMember", memberMutator).Parallel() ctx.BottomUp("SdkMember", memberMutator).Parallel()
ctx.TopDown("SdkMember_deps", memberDepsMutator).Parallel() ctx.TopDown("SdkMember_deps", memberDepsMutator).Parallel()
ctx.BottomUp("SdkMemberInterVersion", memberInterVersionMutator).Parallel()
} }
type dependencyTag struct { type dependencyTag struct {
@@ -383,22 +382,6 @@ func memberDepsMutator(mctx android.TopDownMutatorContext) {
} }
} }
// Step 3: create dependencies from the unversioned SDK member to snapshot versions
// of the same member. By having these dependencies, they are mutated for multiple Mainline modules
// (apex and apk), each of which might want different sdks to be built with. For example, if both
// apex A and B are referencing libfoo which is a member of sdk 'mysdk', the two APEXes can be
// built with libfoo.mysdk.11 and libfoo.mysdk.12, respectively depending on which sdk they are
// using.
func memberInterVersionMutator(mctx android.BottomUpMutatorContext) {
if m, ok := mctx.Module().(android.SdkAware); ok && m.IsInAnySdk() && m.IsVersioned() {
if !m.ContainingSdk().Unversioned() {
memberName := m.MemberName()
tag := sdkMemberVersionedDepTag{member: memberName, version: m.ContainingSdk().Version}
mctx.AddReverseDependency(mctx.Module(), tag, memberName)
}
}
}
// An interface that encapsulates all the functionality needed to manage the sdk dependencies. // An interface that encapsulates all the functionality needed to manage the sdk dependencies.
// //
// It is a mixture of apex and sdk module functionality. // It is a mixture of apex and sdk module functionality.