diff options
| author | 2024-11-12 16:59:20 +0900 | |
|---|---|---|
| committer | 2024-11-12 17:02:15 +0900 | |
| commit | 69c65106def6a86cfd6913cb5ac791411e6210f3 (patch) | |
| tree | 01028f0a08258f220453e35078189dc361736617 | |
| parent | 3c0a042d2056f35ffa7859c72d0aea1c9592e449 (diff) | |
Remove SdkVersion condition from image variants
Image variants must be based on installed partitions. SdkVersion is
orthogonal to image variants. Checking SdkVersion is legacy and it's
causing product modules to be a core variant (incorrectly).
Bug: 370351758
Test: m android_gsi
Change-Id: If496675efa5fe49207ad9c2c32b5e1cddebf1a03
| -rw-r--r-- | cc/image.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cc/image.go b/cc/image.go index ee4048390..9766af3df 100644 --- a/cc/image.go +++ b/cc/image.go @@ -179,9 +179,6 @@ type ImageMutatableModule interface { // SnapshotVersion returns the snapshot version for this module. SnapshotVersion(mctx android.ImageInterfaceContext) string - // SdkVersion returns the SDK version for this module. - SdkVersion() string - // ExtraVariants returns the list of extra variants this module requires. ExtraVariants() []string @@ -370,7 +367,7 @@ func MutateImage(mctx android.ImageInterfaceContext, m ImageMutatableModule) { if m.HasProductVariant() { productVariantNeeded = true } - } else if vendorSpecific && m.SdkVersion() == "" { + } else if vendorSpecific { // This will be available in /vendor (or /odm) only vendorVariantNeeded = true } else { @@ -380,7 +377,7 @@ func MutateImage(mctx android.ImageInterfaceContext, m ImageMutatableModule) { coreVariantNeeded = true } - if coreVariantNeeded && productSpecific && m.SdkVersion() == "" { + if coreVariantNeeded && productSpecific { // The module has "product_specific: true" that does not create core variant. coreVariantNeeded = false productVariantNeeded = true |