commit 4297c39e75bc19d947b3a235fd645b0f6120c1da
author Dan Albert <danalbert@google.com> Tue Dec 19 11:27:39 2017 -0800
committer Dan Albert <danalbert@google.com> Fri Jan 05 11:49:43 2018 -0800
tree 3661228c1cb3aef7959df756f9d1debe1473b949
parent b2e9b2b34f3dc1c8c51203a074112d5ac3372373

Also restrict NDK linking by static/shared STL.

Test: make checkbuild
Bug: None
Change-Id: I0eb29ec483c069d1c12f444fd2e94cc6eb320f93

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index dbfa64a..d934338 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -176,7 +176,7 @@
 include $(BUILD_SYSTEM)/allowed_ndk_types.mk
 
 ifdef LOCAL_SDK_VERSION
-my_link_type := native:ndk:$(my_ndk_stl_family)
+my_link_type := native:ndk:$(my_ndk_stl_family):$(my_ndk_stl_link_type)
 else ifdef LOCAL_USE_VNDK
     _name := $(patsubst %.vendor,%,$(LOCAL_MODULE))
     ifneq ($(filter $(_name),$(VNDK_CORE_LIBRARIES) $(VNDK_SAMEPROCESS_LIBRARIES) $(LLNDK_LIBRARIES)),)