From 0f0f126e5a42d2604ee29a6b4b25d03b6afe6573 Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Thu, 8 Feb 2024 10:33:37 +0900
Subject: Do not add VNDK-SP libraries if VNDK is deprecated

This device has its own logic to add custom VNDK-SP library list to the
packages, but this no longer works because there is no VNDK-SP once VNDK
is deprecated. This change adds condition when adding VNDK-SP package to
work only when VNDK is not deprecated.

Bug: 291703843
Bug: 324972577
Bug: 319669529
Test: barbet-trunk_staging-userdebug build passed
Change-Id: Ifab041d57a3ec2455d8d00fabaf3dccaedb6b934
Merged-In: Ifab041d57a3ec2455d8d00fabaf3dccaedb6b934
(cherry picked from commit 0f78e08caa87e7908810b77583b49298128245d6)
(cherry picked from commit c46258811bed796d235b1ba87a7f3dacf321b55a)
---
 device-common.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device-common.mk b/device-common.mk
index d2a32f3f..6c10a122 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -706,8 +706,10 @@ endif
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
+ifeq ($(KEEP_VNDK),true)
 PRODUCT_PACKAGES += \
     vndk-sp
+endif
 
 # Override heap growth limit due to high display density on device
 PRODUCT_PROPERTY_OVERRIDES += \
-- 
cgit v1.2.3