diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-03-31 15:23:40 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-04-22 12:51:51 +0100 |
| commit | b20ad0a7d4c8aa6d88124bacc45555113fa02f70 (patch) | |
| tree | 7a298af3ba563bff6b31695bcbf2ac80b0efcbc3 /java/java.go | |
| parent | f020796cad863165bac690aed22c9202bf04921c (diff) | |
| download | build_soong-b20ad0a7d4c8aa6d88124bacc45555113fa02f70.tar.gz build_soong-b20ad0a7d4c8aa6d88124bacc45555113fa02f70.tar.bz2 build_soong-b20ad0a7d4c8aa6d88124bacc45555113fa02f70.zip | |
Stop requiring apex_available on java_library members of sdks
Previously, adding java_library to an sdk required that the names of
any APEXes that transitively compiled against it were added to its
apex_available property. This change removes that requirement.
Also corrects the dependency path in the TestApexAvailable_IndirectDep
error which previously passed through "shared from static" static
dependency tags even though those are explicitly NOT followed when
checking apex_available settings.
Bug: 152878661
Bug: 153306490
Test: m droid
Merged-In: I995ed38956c1bc210b09494812de012fed9f9232
Change-Id: I995ed38956c1bc210b09494812de012fed9f9232
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/java/java.go b/java/java.go index 20e01f2a..57ed29d1 100644 --- a/java/java.go +++ b/java/java.go @@ -1764,11 +1764,6 @@ func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu if staticLibTag == ctx.OtherModuleDependencyTag(dep) { return true } - // Also, a dependency to an sdk member is also considered as such. This is required because - // sdk members should be mutated into APEXes. Refer to sdk.sdkDepsReplaceMutator. - if sa, ok := dep.(android.SdkAware); ok && sa.IsInAnySdk() { - return true - } return false } @@ -2508,11 +2503,6 @@ func (j *Import) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu if staticLibTag == ctx.OtherModuleDependencyTag(dep) { return true } - // Also, a dependency to an sdk member is also considered as such. This is required because - // sdk members should be mutated into APEXes. Refer to sdk.sdkDepsReplaceMutator. - if sa, ok := dep.(android.SdkAware); ok && sa.IsInAnySdk() { - return true - } return false } |