d2s: move vndk prebuilts to vendor
* To get rid of BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES
Change-Id: Ic24ee866fca60bddda04a97ac8bbf03d8338536d
diff --git a/device.mk b/device.mk
index 3cb666f..89b1fe5 100644
--- a/device.mk
+++ b/device.mk
@@ -25,8 +25,3 @@
# Overlays
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-
-# VNDK
-PRODUCT_COPY_FILES += \
- prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-sp/libc++.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc++-v28.so \
- prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-sp/libc++.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc++-v28.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 74399a2..3caa5a5 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -55,6 +55,10 @@
-vendor/lib64/libexynoscamera3.so
-vendor/lib64/libiu456_datapath_processor.so
+# libc++ from prebuilts/vndk/v28 - android-12.0.0_r18
+-vendor/lib/libc++-v28.so|c77ce1010570c92687079ab3a287fbfa4f081be2
+-vendor/lib64/libc++-v28.so|373888fd449538b11083d3597775a32e02395339
+
## Codecs
vendor/etc/media_codecs_performance.xml