From a329e3b8ffa11a50987bcd7c4630083fd12f08d0 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Thu, 10 Aug 2023 17:28:05 +0900 Subject: [PATCH] Install llndk.libraries.txt when VNDK is deprecated llndk.libraries.txt is currently installed within VNDK APEX, while all libraries are placed in system image, and list is still valid when VNDK is deprecated. This change adds llndk.libraries.txt into the system image, when VNDK is deprecated. Bug: 290160925 Test: aosp_cf build succeeded with llndk.libraries.txt in the system image Change-Id: I3d5d22dbbc870a59c03fd2e3d0fad54c93f8751e --- target/product/generic_system.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk index 1a639ef717..f194d8b7fe 100644 --- a/target/product/generic_system.mk +++ b/target/product/generic_system.mk @@ -102,6 +102,11 @@ PRODUCT_PACKAGES += \ libaudiopolicyengineconfigurable \ libpolicy-subsystem + +ifneq ($(KEEP_VNDK),true) +PRODUCT_PACKAGES += llndk.libraries.txt +endif + # Include all zygote init scripts. "ro.zygote" will select one of them. PRODUCT_COPY_FILES += \ system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \