commit 737930417c56d76e9a55f6ef620f16b6b0c99b93
author Logan Chien <loganchien@google.com> Sat Jul 13 14:13:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat Jul 13 14:13:32 2019 -0700
tree 9374d1c15622245bf70bd256f1d82b0f1ba535e7
parent 2b3fc786ffe103c010ce0dad01155f7d4c1d877e
parent 014de67d0697dff9a8f3cb3ba579f619a070ec6b

Merge changes Ia0410da8,Id756340f am: 1277b8cca1
am: 014de67d06

Change-Id: Ibaf191d2e94815bca92adcb4f9aa2e2fb1d4b3c7

core/cc_prebuilt_internal.mk

diff --git a/core/cc_prebuilt_internal.mk b/core/cc_prebuilt_internal.mk
index 2bf4fdc..0c87151 100644
--- a/core/cc_prebuilt_internal.mk
+++ b/core/cc_prebuilt_internal.mk
@@ -135,21 +135,23 @@
     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))
+
+# 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
-# Extra shared libraries introduced by LOCAL_CXX_STL.
-include $(BUILD_SYSTEM)/cxx_stl_setup.mk
 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.