diff options
| author | Liz Kammer <eakammer@google.com> | 2021-01-26 09:18:53 -0500 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2021-02-04 13:45:56 -0500 |
| commit | 356f7d45c19ff8b862ff4d5db7384e87c2b052f9 (patch) | |
| tree | 57db9c0e7b1d346c85a40ffd72602dce13c12df9 /java/java.go | |
| parent | aef038aac1f18259a941b05b028e5e9beb5b3bd7 (diff) | |
bp2build: convert paths/module refs to Bazel label
This currently expands all globs, still need to support converting glob
syntax.
Test: go build_conversion_test
Test: GENERATE_BAZEL_FILES=true m nothing
Test: m nothing
Bug: 165114590
Change-Id: If7b26e8e663d17566fad9614ca87a8da1f095284
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 d49b64f66..b5e49afed 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...) |