Add bp2build support for property "compressible" of apex module.
Bug: 214466457
Bug: 207551677
Test: b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Test: b test //build/bazel/tests/apex:build.bazel.examples.apex.minimal_apex
Test: b test //build/bazel/tests/apex:build.bazel.examples.apex.minimal_capex
Change-Id: I6bf12c1b0c52d4486968bb430a67a3c3110766db
diff --git a/apex/apex.go b/apex/apex.go
index a6c63de..0ac6eaa 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -3289,6 +3289,7 @@
Prebuilts bazel.LabelListAttribute
Native_shared_libs_32 bazel.LabelListAttribute
Native_shared_libs_64 bazel.LabelListAttribute
+ Compressible bazel.BoolAttribute
}
type convertedNativeSharedLibs struct {
@@ -3366,6 +3367,11 @@
installableAttribute.Value = a.properties.Installable
}
+ var compressibleAttribute bazel.BoolAttribute
+ if a.overridableProperties.Compressible != nil {
+ compressibleAttribute.Value = a.overridableProperties.Compressible
+ }
+
attrs := &bazelApexBundleAttributes{
Manifest: manifestLabelAttribute,
Android_manifest: androidManifestLabelAttribute,
@@ -3379,6 +3385,7 @@
Native_shared_libs_64: nativeSharedLibs.Native_shared_libs_64,
Binaries: binariesLabelListAttribute,
Prebuilts: prebuiltsLabelListAttribute,
+ Compressible: compressibleAttribute,
}
props := bazel.BazelTargetModuleProperties{
diff --git a/bp2build/apex_conversion_test.go b/bp2build/apex_conversion_test.go
index 4b141c9..9057189 100644
--- a/bp2build/apex_conversion_test.go
+++ b/bp2build/apex_conversion_test.go
@@ -104,6 +104,7 @@
certificate: "com.android.apogee.certificate",
updatable: false,
installable: false,
+ compressible: false,
native_shared_libs: [
"native_shared_lib_1",
"native_shared_lib_2",
@@ -150,7 +151,8 @@
":pretend_prebuilt_1",
":pretend_prebuilt_2",
]`,
- "updatable": "False",
+ "updatable": "False",
+ "compressible": "False",
}),
}})
}