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

This commit is contained in:
Treehugger Robot
2023-10-18 02:48:10 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 5 deletions

View File

@@ -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 \

View File

@@ -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)