diff options
| author | Liz Kammer <eakammer@google.com> | 2021-02-05 13:39:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-05 13:39:08 +0000 |
| commit | b7eab01167af0320e2552826381497111a4c66c6 (patch) | |
| tree | 097b401ce7e704715ca92c1e5be6c389f1a1eb59 /java/java.go | |
| parent | b89336487e22a3671b5e095c279fb33970ea2d39 (diff) | |
| parent | 356f7d45c19ff8b862ff4d5db7384e87c2b052f9 (diff) | |
Merge "bp2build: convert paths/module refs to Bazel label"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 78d974b42..91944f6e3 100644 --- a/java/java.go +++ b/java/java.go @@ -2687,9 +2687,10 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) { } func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) { - if ctx.Arch().ArchType == android.Common { + if ctx.Arch().ArchType == android.Common || ctx.BazelConversionMode() { j.deps(ctx) - } else { + } + if ctx.Arch().ArchType != android.Common || ctx.BazelConversionMode() { // These dependencies ensure the host installation rules will install the jar file and // the jni libraries when the wrapper is installed. ctx.AddVariationDependencies(nil, jniInstallTag, j.binaryProperties.Jni_libs...) |