From da4115d959cb11e0bfd5680547f27468346b50ad Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Tue, 17 Oct 2023 15:54:41 +0900 Subject: [PATCH] Install llndk.libraries.txt with llndk_in_system llndk.libraries.txt was installed from generic_system.mk when VNDK is deprecated. However, as variable KEEP_VNDK is not valid from generic_system.mk, it did not work as expected. Anyway, now llndk.libraries.txt is required for product VNDK deprecation, and also it would be better to be added as a required module with LLNDK libraries over llndk_in_system module. This change relocates defining llndk.libraries.txt as required module into llndk_in_system module. Bug: 290160925 Test: aosp_cf build succeeded with llndk.libraries.txt installed under /system/etc Change-Id: I482f94d701e5dc2b4f01308a65824b38ba5b9fde --- target/product/generic_system.mk | 4 ---- target/product/gsi/Android.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk index ab36eb1c44..6d40436d84 100644 --- a/target/product/generic_system.mk +++ b/target/product/generic_system.mk @@ -104,10 +104,6 @@ PRODUCT_PACKAGES += \ 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 \ diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 655a66622f..fa3d1dabb5 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -230,7 +230,9 @@ LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE # Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB LOCAL_REQUIRED_MODULES := \ - $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) + $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \ + llndk.libraries.txt + include $(BUILD_PHONY_PACKAGE)