From fefb71b59680640098281c592d70566ecf1d5855 Mon Sep 17 00:00:00 2001
From: Shirayuki39 <lorddemecrius83@proton.me>
Date: Wed, 17 Jul 2024 07:13:34 +0800
Subject: [PATCH] LG8n: Build *-v31

Signed-off-by: Shirayuki39 <lorddemecrius83@proton.me>
---
 device.mk       |  6 ++++++
 vndk/Android.mk | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/device.mk b/device.mk
index ffa25d2..af32bf6 100644
--- a/device.mk
+++ b/device.mk
@@ -357,6 +357,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 PRODUCT_PACKAGES += \
     android.hardware.usb-service.transsion
 
+# VNDK
+PRODUCT_PACKAGES += \
+    libutils-v31 \
+    libhidlbase-v31 \
+    libbinder-v31
+
 # Vibrator
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-service.transsion
diff --git a/vndk/Android.mk b/vndk/Android.mk
index bea275b..09e63d8 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -12,3 +12,42 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libutils-v31
+LOCAL_MULTILIB := both
+LOCAL_SRC_FILES_arm := v31/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so
+LOCAL_SRC_FILES_arm64 := v31/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TAGS := optional
+LOCAL_CHECK_ELF_FILES := false
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libbinder-v31
+LOCAL_MULTILIB := both
+LOCAL_SRC_FILES_arm := v31/arm64/arch-arm-armv8-a/shared/vndk-core/libbinder.so
+LOCAL_SRC_FILES_arm64 := v31/arm64/arch-arm64-armv8-a/shared/vndk-core/libbinder.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TAGS := optional
+LOCAL_CHECK_ELF_FILES := false
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libhidlbase-v31
+LOCAL_MULTILIB := both
+LOCAL_SRC_FILES_arm := v31/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
+LOCAL_SRC_FILES_arm64 := v31/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TAGS := optional
+LOCAL_CHECK_ELF_FILES := false
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)