Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b6cba1 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

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
parent 3df5f50e

android/config.go

+1 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ func (c *deviceConfig) ExtraVndkVersions() []string { 
}



func (c *deviceConfig) VndkUseCoreVariant() bool {

	return Bool(c.config.productVariables.VndkUseCoreVariant)

	return Bool(c.config.productVariables.VndkUseCoreVariant) && Bool(c.config.productVariables.KeepVndk)

}



func (c *deviceConfig) SystemSdkVersions() []string {

cc/cc_test.go

+1 −0
Original line number Diff line number Diff line
@@ -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"})