From 1759e2d2f126dab383dc5f6d781cf784fd8a1cfb Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Jan 2018 12:42:20 -0800 Subject: [PATCH] Fix allowed STL types for system libraries. Static libraries using the system STL have type native:ndk:system:none, not native:ndk:system:shared, since no actually linking takes place. These are still allowed to be linked to platform modules. Test: make checkbuild Bug: None Change-Id: Ib999bb0f422ec3938daa740fca5681e153d6525a --- core/allowed_ndk_types.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/allowed_ndk_types.mk b/core/allowed_ndk_types.mk index b5a85ca10..3d7eac4d9 100644 --- a/core/allowed_ndk_types.mk +++ b/core/allowed_ndk_types.mk @@ -79,7 +79,11 @@ ifdef LOCAL_SDK_VERSION # Else we are a non-static library that uses a static STL, and are # incompatible with all other shared libraries that use an STL. else - my_allowed_ndk_types := native:ndk:none:none native:ndk:system:shared + my_allowed_ndk_types := \ + native:ndk:none:none \ + native:ndk:system:none \ + native:ndk:system:shared \ + ifeq ($(LOCAL_MODULE_CLASS),APPS) # CTS is bad and it should feel bad: http://b/13249737 my_warn_ndk_types += native:ndk:libc++:static