Generate product variants by default

PRODUCT_PRODUCT_VNDK_VERSION is set to 'current' by default. Now, we
can generate product variants without checking the
PRODUCT_PRODUCT_VNDK_VERSION build variable. Remove reading the
PRODUCT_PRODUCT_VNDK_VERSION variable from soong and generate product
variants by default.

Bug: 302255959
Test: m
Change-Id: I9a9b2076f4367c5ce9a393bbb206f8dee3884bd8
This commit is contained in:
Justin Yun
2023-09-27 16:22:10 +09:00
parent c5b9abba30
commit af1fde43f9
11 changed files with 32 additions and 235 deletions

View File

@@ -115,12 +115,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
})
t.Run("VNDK APEX gathers only vendor variants even if product variants are available", func(t *testing.T) {
ctx := testApex(t, bp,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
// Now product variant is available
variables.ProductVndkVersion = proptools.StringPtr("current")
}),
)
ctx := testApex(t, bp)
files := getFiles(t, ctx, "com.android.vndk.current", "android_common")
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")