diff options
| author | 2024-12-11 08:49:33 -0800 | |
|---|---|---|
| committer | 2024-12-11 08:49:33 -0800 | |
| commit | c9237f7bb9887dee0d7412559df49d1ce7dddff0 (patch) | |
| tree | 2f048756f7824934dd60b0aaa9b5edea7882fd2b /java/bootclasspath_fragment.go | |
| parent | 1f1e901cb1b9b4bbdcecb97a2c31cd620f0311f9 (diff) | |
| parent | f7bbd2fe40e43f7fda7e08d08eeb9c2a93552ad9 (diff) | |
Split DepIsInSameApex into outgoing and incoming am: f7bbd2fe40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3393290
Change-Id: Ia514f6b2e0bdc19f55a702d5942e8f7c909b44a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 375a1aaf1..d6777e50e 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -393,11 +393,9 @@ func (i BootclasspathFragmentApexContentInfo) ProfileInstallPathInApex() string return i.profileInstallPathInApex } -func (b *BootclasspathFragmentModule) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool { - tag := ctx.OtherModuleDependencyTag(dep) - +func (b *BootclasspathFragmentModule) OutgoingDepIsInSameApex(tag blueprint.DependencyTag) bool { // If the module is a default module, do not check the tag - if _, ok := dep.(*Defaults); ok { + if tag == android.DefaultsDepTag { return true } if IsBootclasspathFragmentContentDepTag(tag) { @@ -414,7 +412,7 @@ func (b *BootclasspathFragmentModule) DepIsInSameApex(ctx android.BaseModuleCont return false } - panic(fmt.Errorf("boot_image module %q should not have a dependency on %q via tag %s", b, dep, android.PrettyPrintTag(tag))) + panic(fmt.Errorf("boot_image module %q should not have a dependency tag %s", b, android.PrettyPrintTag(tag))) } func (b *BootclasspathFragmentModule) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error { |