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

Commit 505982f4 authored by Logan Chien's avatar Logan Chien Committed by android-build-merger
Browse files

Merge changes Ia0410da8,Id756340f am: 1277b8cc am: 014de67d am: 73793041

am: b5cdf6dd

Change-Id: Ie8e82986bf9a409be9c22751557a26ef6622a71c
parents 0d527839 b5cdf6dd
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -135,21 +135,23 @@ else
    endif
endif

my_shared_libraries := \
my_shared_libraries := $(strip \
    $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \
    $(my_system_shared_libraries)
    $(my_system_shared_libraries))

ifdef my_shared_libraries
# Extra shared libraries introduced by LOCAL_CXX_STL.
# Extra shared libraries introduced by LOCAL_CXX_STL (may append some libraries to
# my_shared_libraries).
include $(BUILD_SYSTEM)/cxx_stl_setup.mk

ifdef my_shared_libraries
ifdef LOCAL_USE_VNDK
  my_shared_libraries := $(foreach l,$(my_shared_libraries),\
    $(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
endif
$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \
  $(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries))
endif
endif  # my_shared_libraries
endif  # LOCAL_INSTALLED_MODULE

# We need to enclose the above export_includes and my_built_shared_libraries in
# "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk.