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

Commit a3c987d7 authored by Jooyung Han's avatar Jooyung Han
Browse files

Skip *.libraries.txt when skipping current vndk 

When TARGET_SKIP_CURRENT_VNDK=true current vndk libs are not installed.
Related *.libraries.txt files also should not be installed.

Bug: 132140714
Bug: 137511540
Test: TARGET_SKIP_CURRENT_VNDK=true m systemimage # and, look into /system/etc
Change-Id: Ieea7444c359410dd9a14ac0dd369cae38d18b63a
parent 354dcef2

target/product/base_system.mk

+0 −2
Original line number Diff line number Diff line
@@ -270,8 +270,6 @@ PRODUCT_PACKAGES += \ 
    viewcompiler \

    voip-common \

    vold \

    vndkcore.libraries.txt \

    vndkprivate.libraries.txt \

    WallpaperBackup \

    watchdogd \

    wificond \

target/product/gsi/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ ifneq ($(TARGET_SKIP_CURRENT_VNDK),true) 
LOCAL_REQUIRED_MODULES += \

    llndk.libraries.txt \

    vndksp.libraries.txt \

    vndkcore.libraries.txt \

    vndkprivate.libraries.txt \

    $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))

endif