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

Commit 76d0eb4d authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge "Skip *.libraries.txt when skipping current vndk" 

am: 2359e05e

Change-Id: I972f450e4435be5ca4e77a2d89408882fa6f3305
parents c018e8de 2359e05e

target/product/base_system.mk

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

    viewcompiler \

    voip-common \

    voip-common \

    vold \

    vold \

    vndkcore.libraries.txt \

    vndkprivate.libraries.txt \

    WallpaperBackup \

    WallpaperBackup \

    watchdogd \

    watchdogd \

    wificond \

    wificond \

target/product/gsi/Android.mk

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

LOCAL_REQUIRED_MODULES += \

    llndk.libraries.txt \

    llndk.libraries.txt \

    vndksp.libraries.txt \

    vndksp.libraries.txt \

    vndkcore.libraries.txt \

    vndkprivate.libraries.txt \

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

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

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))

    $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES))

endif

endif