Merge "Add bp2build support for property "compressible" of apex module." am: a61dbd457e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956876 Change-Id: I09735ac7fed527429612fad76f79d0f0a93b4874
This commit is contained in:
@@ -3289,6 +3289,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 {
|
||||
@@ -3366,6 +3367,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,
|
||||
@@ -3379,6 +3385,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{
|
||||
|
@@ -104,6 +104,7 @@ apex {
|
||||
certificate: "com.android.apogee.certificate",
|
||||
updatable: false,
|
||||
installable: false,
|
||||
compressible: false,
|
||||
native_shared_libs: [
|
||||
"native_shared_lib_1",
|
||||
"native_shared_lib_2",
|
||||
@@ -151,6 +152,7 @@ apex {
|
||||
":pretend_prebuilt_2",
|
||||
]`,
|
||||
"updatable": "False",
|
||||
"compressible": "False",
|
||||
}),
|
||||
}})
|
||||
}
|
||||
|
Reference in New Issue
Block a user