summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-05-06 12:02:27 +0100
committer Paul Duffin <paulduffin@google.com> 2021-05-06 23:13:06 +0100
commit2d3da31d41544212fb0dbf1343bc50b83f51f15f (patch)
tree76d5928b68d2b24aed9faa6ae2965edeca4e797e /java
parentb9e7a3ca7afeba46322749b6a3cab10363af76f2 (diff)
Make all SdkMemberTypes support transitive member deps
Previously, only those SdkMemberTypes which had specific need to automatically add some of their dependencies as sdk members would cause the sdk to visit their transitive dependencies. However, as any module can have dependencies on license modules and license modules need to be included in the sdk then it needs to visit transitive dependencies of all members. So, this change removes the support for allowing an SdkMemberType to control whether its transitive dependencies are visited and just visits them all. This does not have any effect on sdk snapshots as in order for a dependency to be added to an sdk it needs to be added with a tag that implements SdkMemberTypeDependencyTag and the only tags that implement this are used by SdkMemberTypes that had enabled transitive members. Bug: 181569894 Test: m art-module-sdk art-module-host-exports art-module-test-exports - verify that this change has no effect on the generated snapshots Change-Id: If0293af0237aa7e39335e5b8383a41c023ff5853
Diffstat (limited to 'java')
-rw-r--r--java/bootclasspath_fragment.go5
-rw-r--r--java/system_modules.go5
2 files changed, 4 insertions, 6 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index 8fe362a56..6270b5b35 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -32,9 +32,8 @@ func init() {
android.RegisterSdkMemberType(&bootclasspathFragmentMemberType{
SdkMemberTypeBase: android.SdkMemberTypeBase{
- PropertyName: "bootclasspath_fragments",
- SupportsSdk: true,
- TransitiveSdkMembers: true,
+ PropertyName: "bootclasspath_fragments",
+ SupportsSdk: true,
},
})
}
diff --git a/java/system_modules.go b/java/system_modules.go
index 473838541..d0dc74adc 100644
--- a/java/system_modules.go
+++ b/java/system_modules.go
@@ -35,9 +35,8 @@ func init() {
// Register sdk member types.
android.RegisterSdkMemberType(&systemModulesSdkMemberType{
android.SdkMemberTypeBase{
- PropertyName: "java_system_modules",
- SupportsSdk: true,
- TransitiveSdkMembers: true,
+ PropertyName: "java_system_modules",
+ SupportsSdk: true,
},
})
}