Revert "Add static_libs support to android_app bp2build converter."
This reverts commit de722acd96
.
Reason for revert: broke bp2build CI
Change-Id: I535e8746e846c20f1a47c2a1eb0362276af49206
This commit is contained in:
@@ -1432,7 +1432,6 @@ type bazelAndroidAppAttributes struct {
|
||||
Manifest bazel.Label
|
||||
Custom_package *string
|
||||
Resource_files bazel.LabelListAttribute
|
||||
Deps bazel.LabelListAttribute
|
||||
}
|
||||
|
||||
// ConvertWithBp2build is used to convert android_app to Bazel.
|
||||
@@ -1450,15 +1449,12 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
||||
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"}
|
||||
|
Reference in New Issue
Block a user