From 7573dba6d6f0de0d3f884ceb63581f5070e40df2 Mon Sep 17 00:00:00 2001
From: Volodymyr Zhdanov <wight554@gmail.com>
Date: Sun, 12 May 2019 15:42:58 +0000
Subject: [PATCH] sdm660-common: Build some extra vendor libraries for camera

* I know it looks ugly but xiaomi does that on production devices
* such as whyred or sagit internal treble beta, so why not
---
 sdm660.mk       |  1 +
 vndk/Android.mk | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 vndk/Android.mk

diff --git a/sdm660.mk b/sdm660.mk
index acde2d78..c111ca5c 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -407,6 +407,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libdng_sdk.vendor_32 \
     libstdc++.vendor \
+    vndk-ext \
     vndk_package
 
 # Wifi
diff --git a/vndk/Android.mk b/vndk/Android.mk
new file mode 100644
index 00000000..7654541c
--- /dev/null
+++ b/vndk/Android.mk
@@ -0,0 +1,44 @@
+LOCAL_PATH := $(call my-dir)
+
+EXTRA_VENDOR_LIBRARIES_32 := \
+    libaudioclient \
+    libaudiomanager \
+    libbinder \
+    libcamera_client \
+    libft2 \
+    libgui.vendor \
+    libharfbuzz_ng \
+    libheif \
+    libicui18n \
+    libicuuc \
+    libmedia \
+    libmediaextractor \
+    libmediametrics \
+    libminikin \
+    libsonivox
+
+define define-vndk-lib
+include $$(CLEAR_VARS)
+LOCAL_MODULE := $1.vndk-ext-gen
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PREBUILT_MODULE_FILE := $$(call intermediates-dir-for,SHARED_LIBRARIES,$1,,,$3,)/$1.so
+LOCAL_STRIP_MODULE := false
+LOCAL_MULTILIB := $2
+LOCAL_MODULE_TAGS := optional
+LOCAL_INSTALLED_MODULE_STEM := $$(basename $1).so
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_VENDOR_MODULE := true
+include $$(BUILD_PREBUILT)
+endef
+
+$(foreach lib,$(EXTRA_VENDOR_LIBRARIES_32),\
+    $(eval $(call define-vndk-lib,$(lib),32,$(TARGET_2ND_ARCH_VAR_PREFIX))))
+
+$(foreach lib,$(EXTRA_VENDOR_LIBRARIES_64),\
+    $(eval $(call define-vndk-lib,$(lib),first,)))
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vndk-ext
+LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-ext-gen,$(EXTRA_VENDOR_LIBRARIES_32) $(EXTRA_VENDOR_LIBRARIES_64))
+include $(BUILD_PHONY_PACKAGE)
\ No newline at end of file