From d116600dc1091f882b96e4fe20d64ea195c3387a Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Fri, 10 Nov 2023 07:47:39 +0000
Subject: [PATCH] Don't build VNDK on GSI

Bug: 308878144
Test: manual mix on T Pixel 6

Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
---
 target/product/gsi_release.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 189b092b0a..fc5db6a1b0 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -62,6 +62,9 @@ PRODUCT_PACKAGES += gsi_overlay_systemui
 PRODUCT_COPY_FILES += \
     device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml
 
+# b/308878144 no more VNDK on 24Q1 and beyond
+KEEP_VNDK ?= false
+
 # Support additional VNDK snapshots
 PRODUCT_EXTRA_VNDK_VERSIONS := \
     30 \