Merge "Add bp2build support for property "compressible" of apex module." (a61dbd45) · Commits · e / os / android_build_soong

apex/apex.go

+7 −0

Original line number	Diff line number	Diff line
		@@ -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{

+3 −1

Original line number	Diff line number	Diff line
		@@ -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",
		}),
		}})
		}