Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4115d9 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

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
parent 2f07f035

target/product/generic_system.mk

+0 −4
Original line number Diff line number Diff line
@@ -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 \

target/product/gsi/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -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)