Automatically add bootclasspath_fragment contents to sdk
Previously, both a bootclasspath_fragment and its contents had to be explicitly added to the sdk. This change means that adding a bootclasspath_fragment to and sdk will automatically add its contents as if they were added using java_boot_libs. Bug: 177892522 Test: m nothing Change-Id: I8f7e70649f272c9a109d4606571a2d12c44b7904
This commit is contained in:
@@ -34,6 +34,7 @@ func init() {
|
||||
SdkMemberTypeBase: android.SdkMemberTypeBase{
|
||||
PropertyName: "bootclasspath_fragments",
|
||||
SupportsSdk: true,
|
||||
TransitiveSdkMembers: true,
|
||||
},
|
||||
})
|
||||
}
|
||||
@@ -60,11 +61,22 @@ func (b bootclasspathFragmentContentDependencyTag) ReplaceSourceWithPrebuilt() b
|
||||
return false
|
||||
}
|
||||
|
||||
// SdkMemberType causes dependencies added with this tag to be automatically added to the sdk as if
|
||||
// they were specified using java_boot_libs.
|
||||
func (b bootclasspathFragmentContentDependencyTag) SdkMemberType() android.SdkMemberType {
|
||||
return javaBootLibsSdkMemberType
|
||||
}
|
||||
|
||||
func (b bootclasspathFragmentContentDependencyTag) ExportMember() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// The tag used for the dependency between the bootclasspath_fragment module and its contents.
|
||||
var bootclasspathFragmentContentDepTag = bootclasspathFragmentContentDependencyTag{}
|
||||
|
||||
var _ android.ExcludeFromVisibilityEnforcementTag = bootclasspathFragmentContentDepTag
|
||||
var _ android.ReplaceSourceWithPrebuilt = bootclasspathFragmentContentDepTag
|
||||
var _ android.SdkMemberTypeDependencyTag = bootclasspathFragmentContentDepTag
|
||||
|
||||
func IsBootclasspathFragmentContentDepTag(tag blueprint.DependencyTag) bool {
|
||||
return tag == bootclasspathFragmentContentDepTag
|
||||
|
@@ -52,7 +52,6 @@ func TestSnapshotWithBootclasspathFragment_ImageName(t *testing.T) {
|
||||
sdk {
|
||||
name: "mysdk",
|
||||
bootclasspath_fragments: ["mybootclasspathfragment"],
|
||||
java_boot_libs: ["mybootlib"],
|
||||
}
|
||||
|
||||
apex {
|
||||
@@ -166,7 +165,6 @@ func TestSnapshotWithBootClasspathFragment_Contents(t *testing.T) {
|
||||
sdk {
|
||||
name: "mysdk",
|
||||
bootclasspath_fragments: ["mybootclasspathfragment"],
|
||||
java_boot_libs: ["mybootlib"],
|
||||
}
|
||||
|
||||
bootclasspath_fragment {
|
||||
@@ -288,7 +286,6 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
|
||||
sdk {
|
||||
name: "mysdk",
|
||||
bootclasspath_fragments: ["mybootclasspathfragment"],
|
||||
java_boot_libs: ["mybootlib"],
|
||||
}
|
||||
|
||||
bootclasspath_fragment {
|
||||
|
Reference in New Issue
Block a user