summaryrefslogtreecommitdiff
path: root/java/aar.go
diff options
context:
space:
mode:
author Liz Kammer <eakammer@google.com> 2023-08-08 20:07:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 20:07:01 +0000
commit44536d9bfa791bbbb9b22ce720b7ee45abcb99c3 (patch)
tree8c319c51ba299e3772e6bd3410ed16ca6623037c /java/aar.go
parent6266d3e7afffc158d5dd26c34d935fb50a1fcfa1 (diff)
parent472f943b6d90027397d0abb25325195b456be05f (diff)
Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb am: 1397a3a96b am: 472f943b6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067 Change-Id: I6cc8aa28f3eb1a8eb100d78eb9f9c7d436245c44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/aar.go')
-rw-r--r--java/aar.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go
index 180e1d726..20972b2d8 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -1305,7 +1305,11 @@ func AndroidLibraryBazelTargetModuleProperties() bazel.BazelTargetModuleProperti
}
func (a *AndroidLibrary) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
- commonAttrs, bp2buildInfo := a.convertLibraryAttrsBp2Build(ctx)
+ commonAttrs, bp2buildInfo, supported := a.convertLibraryAttrsBp2Build(ctx)
+ if !supported {
+ return
+ }
+
depLabels := bp2buildInfo.DepLabels
deps := depLabels.Deps