Merge "Remove VndkUseCoreVariant related code from build" into main am: 60cec95e01 am: f204f58469

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

Change-Id: I64306d029ba179d51d6ece51089eeb258a288ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim
2024-05-29 21:54:06 +00:00
committed by Automerger Merge Worker
10 changed files with 6 additions and 155 deletions

View File

@@ -1471,10 +1471,6 @@ func (c *deviceConfig) ExtraVndkVersions() []string {
return c.config.productVariables.ExtraVndkVersions
}
func (c *deviceConfig) VndkUseCoreVariant() bool {
return Bool(c.config.productVariables.VndkUseCoreVariant) && Bool(c.config.productVariables.KeepVndk)
}
func (c *deviceConfig) SystemSdkVersions() []string {
return c.config.productVariables.DeviceSystemSdkVersions
}