From cee7e66b07cdea5d37fbdd94bb1a34cc8caa448f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 9 Jul 2020 17:32:57 +0100 Subject: 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 --- android/sdk.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'android/sdk.go') 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} } -- cgit v1.2.3-59-g8ed1b