Merge "Add bp2build support for property "compressible" of apex module." am: a61dbd457e am: c311b19b3a am: 254b753da8

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956876

Change-Id: I1973da08736cfee611327a5920a1dd078e4f5af7
This commit is contained in:
Wei Li
2022-01-26 02:21:54 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 1 deletions

View File

@@ -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{

View File

@@ -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",
@@ -150,7 +151,8 @@ apex {
":pretend_prebuilt_1",
":pretend_prebuilt_2",
]`,
"updatable": "False",
"updatable": "False",
"compressible": "False",
}),
}})
}