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

Commit f161d653 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main

parents 5a55439d 03b6cba1

android/config.go

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,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
@@ -677,6 +677,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"})