tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf am: 22508c4eb2

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368

Change-Id: I0c3da51ee74749ab238b544a57da62d7ae90394b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim 2023-10-09 06:45:43 +00:00 committed by Automerger Merge Worker
commit 0ccd34b149
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/config.go
View file

@ -1451,7 +1451,7 @@ func (c *deviceConfig) ExtraVndkVersions() []string {
} }
func (c *deviceConfig) VndkUseCoreVariant() bool { 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 { func (c *deviceConfig) SystemSdkVersions() []string {

1
cc/cc_test.go
View file

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