Merge "Allow platform modules to link to vendor public libraries"
am: fb6389d720
Change-Id: Ie5975db3dbd7c290bd1be0603375f0cde34e7a96
This commit is contained in:
commit
2dc643eb36
1 changed files with 9 additions and 0 deletions
|
@ -1330,6 +1330,15 @@ ifneq ($(LOCAL_USE_VNDK),)
|
||||||
endif
|
endif
|
||||||
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
|
## Set up installed module dependency
|
||||||
## We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for
|
## We cannot compute the full path of the LOCAL_SHARED_LIBRARIES for
|
||||||
|
|
Loading…
Reference in a new issue