Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated

TARGET_VNDK_USE_CORE_VARIANT enables vendor to use some of the VNDK
libraries with core variant installed in /system/lib. However, this does
not make sense when VNDK is deprecated. This change is to ignore
TARGET_VNDK_USE_CORE_VARIANT when the VNDK is deprecated.

Bug: 303754049
Test: aosp_cf_x86_go_phone boot succeeded
Change-Id: Ie9fa75e0fa452e48924d51d64201690ffb271f33
This commit is contained in:
Kiyoung Kim
2023-10-06 14:12:43 +09:00
parent 3df5f50e1a
commit 03b6cba1f2
2 changed files with 2 additions and 1 deletions

View File

@@ -707,6 +707,7 @@ func TestVndkUsingCoreVariant(t *testing.T) {
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
config.TestProductVariables.KeepVndk = BoolPtr(true)
setVndkMustUseVendorVariantListForTest(config, []string{"libvndk"})