diff options
| author | 2023-08-29 16:01:46 +0000 | |
|---|---|---|
| committer | 2023-09-21 03:58:24 +0000 | |
| commit | ee51bd6588ceb122dbf5f6d12bc398a1ce7f37ed (patch) | |
| tree | a6a0bd058f5d3d4eb8a00a4bb38e825d3833bd36 /java | |
| parent | 8d3ea47ec1b5af9b183f9a2ea0e5eb09d7dfb73c (diff) | |
Mark android_* modules with java_resources as unconvertible
Change-Id: I9da921feaf9edb5fe7d1b1cb733494f90d8c64b3
BUG: 300470246
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 3 | ||||
| -rwxr-xr-x | java/app.go | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/java/aar.go b/java/aar.go index f28d97149..8f5deab39 100644 --- a/java/aar.go +++ b/java/aar.go @@ -1352,6 +1352,9 @@ func (a *AndroidLibrary) ConvertWithBp2build(ctx android.Bp2buildMutatorContext) if !supported { return } + if hasJavaResources := aaptAttrs.ConvertJavaResources(ctx, commonAttrs); hasJavaResources { + return + } ctx.CreateBazelTargetModule( props, android.CommonAttributes{Name: name}, diff --git a/java/app.go b/java/app.go index 871631622..735cf6da9 100755 --- a/java/app.go +++ b/java/app.go @@ -1635,6 +1635,15 @@ type bazelAndroidAppAttributes struct { Proguard_specs bazel.LabelListAttribute } +func (b bazelAapt) ConvertJavaResources(ctx android.Bp2buildMutatorContext, javaAttrs *javaCommonAttributes) bool { + // TODO (b/300470246) bp2build support for java_resources & java_resource_dirs in android rules + hasJavaResources := !javaAttrs.javaResourcesAttributes.Resources.IsEmpty() + if hasJavaResources { + ctx.MarkBp2buildUnconvertible(bp2build_metrics_proto.UnconvertedReasonType_UNSUPPORTED, "(b/300470246) java resources in android_* module") + } + return hasJavaResources +} + func convertWithBp2build(ctx android.Bp2buildMutatorContext, a *AndroidApp) (bool, android.CommonAttributes, *bazelAndroidAppAttributes) { aapt, supported := a.convertAaptAttrsWithBp2Build(ctx) if !supported { @@ -1727,6 +1736,10 @@ func convertWithBp2build(ctx android.Bp2buildMutatorContext, a *AndroidApp) (boo if !supported { return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{} } + if hasJavaResources := aapt.ConvertJavaResources(ctx, commonAttrs); hasJavaResources { + return false, android.CommonAttributes{}, &bazelAndroidAppAttributes{} + } + depLabels := bp2BuildInfo.DepLabels deps := depLabels.Deps |