Revert "Revert "Add static_libs support to android_app bp2build converter.""
This reverts commit b33e0b8b5bca6380e07b98568fcef11ba4885b61.
Reason for revert: CI failure deemed to be a fluke
Change-Id: Ia804d531092921e4ad090740420c4a4e02e6ff00
diff --git a/java/app.go b/java/app.go
index 1c69aeb..ffe3e07 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1432,6 +1432,7 @@
Manifest bazel.Label
Custom_package *string
Resource_files bazel.LabelListAttribute
+ Deps bazel.LabelListAttribute
}
// ConvertWithBp2build is used to convert android_app to Bazel.
@@ -1449,12 +1450,15 @@
resourceFiles.Includes = append(resourceFiles.Includes, files...)
}
+ deps := bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, a.properties.Static_libs))
+
attrs := &bazelAndroidAppAttributes{
Srcs: srcs,
Manifest: android.BazelLabelForModuleSrcSingle(ctx, manifest),
// TODO(b/209576404): handle package name override by product variable PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES
Custom_package: a.overridableAppProperties.Package_name,
Resource_files: bazel.MakeLabelListAttribute(resourceFiles),
+ Deps: deps,
}
props := bazel.BazelTargetModuleProperties{Rule_class: "android_binary",
Bzl_load_location: "@rules_android//rules:rules.bzl"}