From e7ead8fa9c91d20a939abe2df4f06f3306af3dc8 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sun, 26 Dec 2021 14:54:58 +0100 Subject: [PATCH] d2x: move vndk prebuilts to vendor * To get rid of BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES Change-Id: Ic24ee866fca60bddda04a97ac8bbf03d8338536d --- device.mk | 5 ----- proprietary-files.txt | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index 40bb65d..dc61d26 100644 --- a/device.mk +++ b/device.mk @@ -25,8 +25,3 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) # 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 4906ae5..4e14699 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -55,6 +55,10 @@ vendor/firmware/bcm4375B1_semco_sem.hcd -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