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

This commit is contained in:
Jooyung Han 2019-09-10 01:04:35 +00:00 committed by Gerrit Code Review
commit 2359e05efb
2 changed files with 2 additions and 2 deletions

View file

@ -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 \

View file

@ -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