APEXes contain VNDK libraries when VNDK is deprecated

Currently vendor APEX can link to VNDK when 'use_vndk_as_stable'
property is set as true. However, when VNDK is deprecated, all former
VNDK libraries should be included in the vendor APEX despite of property
value. This change ignores use_vndk_as_stable when VNDK is set as
deprecated.

Bug: 290318998
Test: aosp_cf_x86_64_phone with WITH_VNDK=false build checked that
Vendor APEX contains all required VNDK libraries within the APEX

Change-Id: I648277d734274e7852b3effc24e7780e55089f75
This commit is contained in:
Kiyoung Kim
2023-07-26 12:39:19 +09:00
parent 9081d142cb
commit 8269cee6e2
2 changed files with 16 additions and 3 deletions

View File

@@ -3029,7 +3029,11 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) {
vendor: true,
shared_libs: ["libvndk", "libvendor"],
}
`)
`,
android.FixtureModifyConfig(func(config android.Config) {
config.TestProductVariables.KeepVndk = proptools.BoolPtr(true)
}),
)
vendorVariant := "android_vendor.29_arm64_armv8-a"