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

Commit a67b3f50 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Allow platform modules to link to vendor public libraries" am: fb6389d7

am: 2dc643eb

Change-Id: I556ef8c1f3da1580021327d6246112d8a1e51660
parents 6042b711 2dc643eb
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -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