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

Commit b5cdf6dd 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

Change-Id: Ia086b7302a1921ef5117b9505f1b051d810a36d7
parents 8c2d5f18 73793041
Loading
Loading
Loading
Loading
+7 −5
Original line number Original line Diff line number Diff line
@@ -135,21 +135,23 @@ else
    endif
    endif
endif
endif


my_shared_libraries := \
my_shared_libraries := $(strip \
    $(filter-out $(my_system_shared_libraries),$(LOCAL_SHARED_LIBRARIES)) \
    $(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 (may append some libraries to
# Extra shared libraries introduced by LOCAL_CXX_STL.
# my_shared_libraries).
include $(BUILD_SYSTEM)/cxx_stl_setup.mk
include $(BUILD_SYSTEM)/cxx_stl_setup.mk

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


# We need to enclose the above export_includes and my_built_shared_libraries in
# 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.
# "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk.