diff options
| author | 2023-08-08 20:48:44 +0000 | |
|---|---|---|
| committer | 2023-08-08 20:48:44 +0000 | |
| commit | c519bc6f28a0fe44f1564da376a0a8df9adf9b25 (patch) | |
| tree | c9cd316d03482cbe4d9a45421aac09bc2358ac38 /java/aar.go | |
| parent | 461e21780409418e15b45786267da25ca42f2a66 (diff) | |
| parent | 44536d9bfa791bbbb9b22ce720b7ee45abcb99c3 (diff) | |
Merge "Add unconverted reason for jarjar incompatibility." into main am: 6b6b150d0a am: 7d941462bb am: 1397a3a96b am: 472f943b6d am: 44536d9bfa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2696067
Change-Id: I7d831ad01c92b86d585764dc8cbcffa58a649353
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.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index 21e25e97a..6e751f3e0 100644 --- a/java/aar.go +++ b/java/aar.go @@ -1307,7 +1307,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 |