Merge "Add bp2build support for property "compressible" of apex module." am: a61dbd457e
am: c311b19b3a
am: 254b753da8
am: 7e82c20b19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956876 Change-Id: Ie5033ec7691a8613548ba124822cb272831bd5c7
This commit is contained in:
@@ -3291,6 +3291,7 @@ type bazelApexBundleAttributes struct {
|
||||
Prebuilts bazel.LabelListAttribute
|
||||
Native_shared_libs_32 bazel.LabelListAttribute
|
||||
Native_shared_libs_64 bazel.LabelListAttribute
|
||||
Compressible bazel.BoolAttribute
|
||||
}
|
||||
|
||||
type convertedNativeSharedLibs struct {
|
||||
@@ -3368,6 +3369,11 @@ func (a *apexBundle) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
||||
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,
|
||||
@@ -3381,6 +3387,7 @@ func (a *apexBundle) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
||||
Native_shared_libs_64: nativeSharedLibs.Native_shared_libs_64,
|
||||
Binaries: binariesLabelListAttribute,
|
||||
Prebuilts: prebuiltsLabelListAttribute,
|
||||
Compressible: compressibleAttribute,
|
||||
}
|
||||
|
||||
props := bazel.BazelTargetModuleProperties{
|
||||
|
Reference in New Issue
Block a user