StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Install llndk.libraries.txt with llndk_in_system" into main am: bd7e1b13d2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792453

Change-Id: I0ecef7a2a032745363e70d1655a71c69eddd091a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-18 03:23:03 +00:00
committed by Automerger Merge Worker
parent 9fd02e94bb bd7e1b13d2
commit 3df2b4a04f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/generic_system.mk
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 \

4
target/product/gsi/Android.mk
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)