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

Merge "Exclude sdkMemberVersionedDepTag from visibility enforcement" am: 7839d8fbed am: 121880e321

Browse Source 
Change-Id: I0efe17f5bcec24b4ba3a59bb93591583267c6dcc
This commit is contained in:
Automerger Merge Worker
2020-01-16 21:08:12 +00:00
parent 0a5b3ff2b7 121880e321
commit 13f8b4fc13
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdk/sdk.go
View File

@@ -285,12 +285,15 @@ type dependencyTag struct {
// For dependencies from an in-development version of an SDK member to frozen versions of the same member // For dependencies from an in-development version of an SDK member to frozen versions of the same member
// e.g. libfoo -> libfoo.mysdk.11 and libfoo.mysdk.12 // e.g. libfoo -> libfoo.mysdk.11 and libfoo.mysdk.12
type sdkMemberVesionedDepTag struct { type sdkMemberVersionedDepTag struct {
dependencyTag dependencyTag
member string member string
version string version string
} }
// Mark this tag so dependencies that use it are excluded from visibility enforcement.
func (t sdkMemberVersionedDepTag) ExcludeFromVisibilityEnforcement() {}
// Step 1: create dependencies from an SDK module to its members. // Step 1: create dependencies from an SDK module to its members.
func memberMutator(mctx android.BottomUpMutatorContext) { func memberMutator(mctx android.BottomUpMutatorContext) {
if s, ok := mctx.Module().(*sdk); ok { if s, ok := mctx.Module().(*sdk); ok {
@@ -337,7 +340,7 @@ func memberInterVersionMutator(mctx android.BottomUpMutatorContext) {
if m, ok := mctx.Module().(android.SdkAware); ok && m.IsInAnySdk() { if m, ok := mctx.Module().(android.SdkAware); ok && m.IsInAnySdk() {
if !m.ContainingSdk().Unversioned() { if !m.ContainingSdk().Unversioned() {
memberName := m.MemberName() memberName := m.MemberName()
tag := sdkMemberVesionedDepTag{member: memberName, version: m.ContainingSdk().Version} tag := sdkMemberVersionedDepTag{member: memberName, version: m.ContainingSdk().Version}
mctx.AddReverseDependency(mctx.Module(), tag, memberName) mctx.AddReverseDependency(mctx.Module(), tag, memberName)
} }
} }