diff options
| author | 2024-12-11 08:49:33 -0800 | |
|---|---|---|
| committer | 2024-12-11 08:49:33 -0800 | |
| commit | c9237f7bb9887dee0d7412559df49d1ce7dddff0 (patch) | |
| tree | 2f048756f7824934dd60b0aaa9b5edea7882fd2b /java/base.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/base.go')
| -rw-r--r-- | java/base.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/base.go b/java/base.go index b579a5d0f..215285fdb 100644 --- a/java/base.go +++ b/java/base.go @@ -365,13 +365,13 @@ func (e *embeddableInModuleAndImport) initModuleAndImport(module android.Module) e.initSdkLibraryComponent(module) } -// Module/Import's DepIsInSameApex(...) delegates to this method. +// Module/Import's OutgoingDepIsInSameApex(...) delegates to this method. // -// This cannot implement DepIsInSameApex(...) directly as that leads to ambiguity with +// This cannot implement OutgoingDepIsInSameApex(...) directly as that leads to ambiguity with // the one provided by ApexModuleBase. -func (e *embeddableInModuleAndImport) depIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool { +func (e *embeddableInModuleAndImport) depIsInSameApex(tag blueprint.DependencyTag) bool { // dependencies other than the static linkage are all considered crossing APEX boundary - if staticLibTag == ctx.OtherModuleDependencyTag(dep) { + if tag == staticLibTag { return true } return false @@ -2214,8 +2214,8 @@ func (j *Module) hasCode(ctx android.ModuleContext) bool { } // Implements android.ApexModule -func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool { - return j.depIsInSameApex(ctx, dep) +func (j *Module) OutgoingDepIsInSameApex(tag blueprint.DependencyTag) bool { + return j.depIsInSameApex(tag) } // Implements android.ApexModule |