Merge "Allow platform modules to link to vendor public libraries" am: fb6389d720 am: 2dc643eb36

am: a67b3f50a6

Change-Id: I8a1cc8a6078094ffff742a3315373607ab3af6bf
This commit is contained in:
Jiyong Park 2018-03-30 04:00:12 +00:00 committed by android-build-merger
commit fbfbd4c611

View file

@ -1330,6 +1330,15 @@ ifneq ($(LOCAL_USE_VNDK),)
endif
endif
# Platform can use vendor public libraries. If a required shared lib is one of
# the vendor public libraries, the lib is switched to the stub version of the lib.
ifeq ($(LOCAL_USE_VNDK),)
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
my_shared_libraries := $(foreach l,$(my_shared_libraries),\
$(if $(filter $(l),$(VENDOR_PUBLIC_LIBRARIES)),$(l).vendorpublic,$(l)))
endif
endif
##########################################################
## Set up installed module dependency
## We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for