commit bd7e1b13d2e47bc8bd3d5bc46f9a71705b016ae9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 18 02:48:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 18 02:48:10 2023 +0000
tree aef5807d69b9f4e28b49b26f347d85d8c4b797ed
parent e7bf32f0debacd9c1edbb67e2422d6e15ddcc1da
parent da4115d959cb11e0bfd5680547f27468346b50ad

Merge "Install llndk.libraries.txt with llndk_in_system" into main

target/product/generic_system.mk

diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index ab36eb1..6d40436 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -104,10 +104,6 @@
     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 \

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 655a666..fa3d1da 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -230,7 +230,9 @@
 
 # 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)