diff options
author | 2020-07-09 17:32:57 +0100 | |
---|---|---|
committer | 2020-07-09 17:51:06 +0100 | |
commit | cee7e66b07cdea5d37fbdd94bb1a34cc8caa448f (patch) | |
tree | a426527fda0c17f2fb52ae212f805ca8fae40857 /android/sdk.go | |
parent | 2c79c871d9a7e521a77a9fd0466eb932f5c92cc1 (diff) |
Ensure that sdk/module_exports depends on source members
Previously, preferring a prebuilt of an sdk/module_exports's member
would cause the sdk/module_exports to depend on the prebuilt instead
of the source and cause problems with the build.
This chance prevents the dependency from an sdk/module_exports to its
members from being replaced with prebuilts.
Bug: 160785918
Test: m nothing
Change-Id: Iee4bcd438c11929e30fb5766701b05a0e89956d9
Diffstat (limited to 'android/sdk.go')
-rw-r--r-- | android/sdk.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/android/sdk.go b/android/sdk.go index e823106e8..8115b690b 100644 --- a/android/sdk.go +++ b/android/sdk.go @@ -266,6 +266,9 @@ type SdkMemberTypeDependencyTag interface { SdkMemberType() SdkMemberType } +var _ SdkMemberTypeDependencyTag = (*sdkMemberDependencyTag)(nil) +var _ ReplaceSourceWithPrebuilt = (*sdkMemberDependencyTag)(nil) + type sdkMemberDependencyTag struct { blueprint.BaseDependencyTag memberType SdkMemberType @@ -275,6 +278,12 @@ func (t *sdkMemberDependencyTag) SdkMemberType() SdkMemberType { return t.memberType } +// Prevent dependencies from the sdk/module_exports onto their members from being +// replaced with a preferred prebuilt. +func (t *sdkMemberDependencyTag) ReplaceSourceWithPrebuilt() bool { + return false +} + func DependencyTagForSdkMemberType(memberType SdkMemberType) SdkMemberTypeDependencyTag { return &sdkMemberDependencyTag{memberType: memberType} } |