StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf am: 22508c4eb2 am: 0ccd34b149 am: c90533a119 am: c2ef241726

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

Change-Id: Ide2bb5ae143d335a7012276713f7e35982e1a82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim
2023-10-09 08:45:33 +00:00
committed by Automerger Merge Worker
parent 2ba34e8f72 c2ef241726
commit 0c6935113b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/config.go
View File

@@ -1455,7 +1455,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 {