Merge "Install llndk.libraries.txt with llndk_in_system" into main am: bd7e1b13d2
am: 3df2b4a04f
Original change: https://android-review.googlesource.com/c/platform/build/+/2792453 Change-Id: Ie2119d30bd52564f3795a8ac6b4bdc16aeb3995b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 \
|
||||
|
@@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user